diff --git a/Makefile b/Makefile
index 807ab5058..33954db05 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,9 @@ include/config.h: .config
 
 include/bb_config.h: include/config.h
 	echo "#ifndef AUTOCONF_INCLUDED" > $@
-	sed -e 's/#undef \(.*\)/static const int \1 = 0;/' < $< >> $@
+	sed -e 's/#undef CONFIG_\(.*\)/#define ENABLE_\1 0/' \
+	    -e 's/#define CONFIG_\(.*\)/#define CONFIG_\1\n#define ENABLE_\1/' \
+		< $< >> $@
 	echo "#endif" >> $@
 
 finished2:
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 1b43a0825..f79fd83be 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -559,7 +559,7 @@ int ifconfig_main(int argc, char **argv)
 		continue;
 	}					/* end of while-loop */
 
-	if (CONFIG_FEATURE_CLEAN_UP) close(sockfd);
+	if (ENABLE_FEATURE_CLEAN_UP) close(sockfd);
 	return goterr;
 }