diff --git a/devel/distcc/init.d/distcc.conf b/devel/distcc/init.d/distcc.conf
index 30756fc..c8b373f 100644
--- a/devel/distcc/init.d/distcc.conf
+++ b/devel/distcc/init.d/distcc.conf
@@ -1,6 +1,3 @@
-USER="distcc"
-ALLOWED="0.0.0.0/24"
-LOGFILE="/var/log/distcc"
-LOGLEVEL="info"
-LISTEN="0.0.0.0"
-JOBS="3"
+# For the arguments and description see distccd(1)
+
+DISTCCD_ARGS="--listen 0.0.0.0 --allow 0.0.0.0/24 --jobs 3"
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 3099458..81b4a8d 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -1,8 +1,7 @@
. $SECTION_DIRECTORY/FUNCTIONS &&
default_configure_gcc &&
-. $GRIMOIRE/config_query_multi.function
-config_query_multi GCC_TARGET "Select what build to use" \
+config_query_list GCC_TARGET "Select what build to use" \
all \
bootstrap \
bootstrap-lean \
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 525a3c2..4e20a2e 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * CONFIGURE: should be _list not _multi
+
2011-07-31 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: TMPFS=off for all (1GB is not enough space)
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (f1d7efa931e99a87edcf3fa67662dd6988579b55),
Vlad Glagolev, 07/31/2011