diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3d11af04..7df7d6e3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2828,6 +2828,7 @@ Derek Kelly <user.vdr@gmail.com>
  are no short names at all
  for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
  for reporting a missing template for DVBDIR in Make.config.template
+ for suggesting to add ARGSDIR to the ONEDIR section of Make.config.template
 
 Marcel Unbehaun <frostworks@gmx.de>
  for adding cRecordingInfo::GetEvent()
diff --git a/HISTORY b/HISTORY
index e47c9393..97f6f907 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8445,3 +8445,5 @@ Video Disk Recorder Revision History
   descramble (see MANUAL for details).
 - Added support for smart card activation (see MANUAL, section "Setup/CAM").
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Added ARGSDIR to the ONEDIR section of Make.config.template (suggested by Derek
+  Kelly).
diff --git a/Make.config.template b/Make.config.template
index dbb54140..88b62863 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 3.1 2014/04/14 11:43:53 kls Exp $
+# $Id: Make.config.template 3.2 2015/01/30 15:18:47 kls Exp $
 
 ### The C compiler and options:
 
@@ -58,6 +58,7 @@ ifdef ONEDIR
 VIDEODIR     = /video
 CACHEDIR     = $(VIDEODIR)
 CONFDIR      = $(VIDEODIR)
+ARGSDIR      = $(VIDEODIR)/conf.d
 RESDIR       = $(VIDEODIR)
 endif