diff --git a/build/modules.conf.in b/build/modules.conf.in
index f678a2337c..3131741512 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -87,6 +87,6 @@ say/mod_say_ru
 
 
 
-# Experimental Modules (don't cry if they're broken)
+## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/endpoints/mod_khomp
 #../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/configure.in b/configure.in
index 64d627e732..9c37a741e6 100644
--- a/configure.in
+++ b/configure.in
@@ -782,7 +782,7 @@ AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])
 LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`'
 TOUCH_TARGET='if test -f "$@";then touch "$@";fi;'
 CONF_MODULES='$$(grep -v "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" | sort | uniq )'
-CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" | sort | uniq )'
+CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed -e "s|^.*/||" | sort | uniq )'
 OUR_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-all ; done )"; echo $$mods )'
 OUR_CLEAN_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
 OUR_INSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'