diff --git a/init/Kconfig b/init/Kconfig
index d2eb7a84a264f0330d0aab1792f3ac34bbba23b2..899e46eec1b2de3fe5b66a4c9b4e70faa0004f5d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -202,7 +202,7 @@ config AUDITSYSCALL
 	  ensure that INOTIFY is configured.
 
 config IKCONFIG
-	bool "Kernel .config support"
+	tristate "Kernel .config support"
 	---help---
 	  This option enables the complete Linux kernel ".config" file
 	  contents to be saved in the kernel. It provides documentation
diff --git a/scripts/Makefile b/scripts/Makefile
index ea41de8fb7f57c09d6ff2297a5ee985077fd695f..1c73c5aea66b06bcecff315356abcecc2a79522f 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -13,7 +13,7 @@ hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
-always		:= $(hostprogs-y)
+always		:= $(hostprogs-y) $(hostprogs-m)
 
 # The following hostprogs-y programs are only build on demand
 hostprogs-y += unifdef