diff --git a/build/make/configure.sh b/build/make/configure.sh
index 52aea9d49f9bdcd91d274c2843043c663c0b5253..bb7ab41105c9966b946a7eed9d0d26c3245fe20a 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -512,7 +512,7 @@ process_common_cmdline() {
           echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
             die_unknown $opt
         fi
-        $action $option
+        ${action}_feature $option
         ;;
         --require-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
@@ -524,7 +524,7 @@ process_common_cmdline() {
         ;;
         --force-enable-?*|--force-disable-?*)
         eval `echo "$opt" | sed 's/--force-/action=/;s/-/ option=/;s/-/_/g'`
-        $action $option
+        ${action}_feature $option
         ;;
         --libc=*)
         [ -d "${optval}" ] || die "Not a directory: ${optval}"
diff --git a/configure b/configure
index 16326701bb54379a92865312fd65534b34ac078e..a2520819ecf846fb5c8de9dd25fae17e1ab1abd9 100755
--- a/configure
+++ b/configure
@@ -363,7 +363,7 @@ process_cmdline() {
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then
             if enabled experimental; then
-                $action $option
+                ${action}_feature $option
             else
                 log_echo "Ignoring $opt -- not in experimental mode."
             fi