diff --git a/acinclude.m4 b/acinclude.m4
index 5cc78ebbc..4aa5db652 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -244,6 +244,12 @@ TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/con
 TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
 	[--with-datadir=PATH], [where to find data files])
 
+TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
+	[--with-controldir=PATH], [where to find control scripts])
+
+TUXBOX_APPS_DIRECTORY_ONE(controldir_var, CONTROLDIR_VAR, localstatedir, /var, /tuxbox/control,
+	[--with-controldir_var=PATH], [where to find control scripts in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
 	[--with-fontdir=PATH], [where to find fonts])
 
@@ -320,6 +326,8 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
+AC_SUBST(CONTROLDIR)
+AC_SUBST(CONTROLDIR_VAR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index e4359173a..6dddec3b5 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -107,6 +107,8 @@ install-data-hook:
 		sed -i \
 			-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
 			-e 's|%(DATADIR)|$(DATADIR)|g' \
+			-e 's|%(CONTROLDIR)|$(CONTROLDIR)|g' \
+			-e 's|%(CONTROLDIR_VAR)|$(CONTROLDIR_VAR)|g' \
 			-e 's|%(FONTDIR)|$(FONTDIR)|g' \
 			-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
 			-e 's|%(LIBDIR)|$(LIBDIR)|g' \
diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
index bfc5bd900..fa6f7f75b 100644
--- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -452,6 +452,8 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
 		else if (ycmd_type == "define-get") {
 			     if (ycmd_name.compare("CONFIGDIR"))	yresult = CONFIGDIR;
 			else if (ycmd_name.compare("DATADIR"))		yresult = DATADIR;
+			else if (ycmd_name.compare("CONTROLDIR"))	yresult = CONTROLDIR;
+			else if (ycmd_name.compare("CONTROLDIR_VAR"))	yresult = CONTROLDIR_VAR;
 			else if (ycmd_name.compare("FONTDIR"))		yresult = FONTDIR;
 			else if (ycmd_name.compare("FONTDIR_VAR"))	yresult = FONTDIR_VAR;
 			else if (ycmd_name.compare("LIBDIR"))		yresult = LIBDIR;