diff --git a/[refs] b/[refs]
index 380136cdecf2..8d91589902eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c37c054a7493e0537ea3d15a59dac3a0aa63a05
+refs/heads/master: d9d8d7ed498ec65bea72dd24be7b9cd35af0c200
diff --git a/trunk/Makefile b/trunk/Makefile
index 77ea707d8543..8e9f9efc5b39 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -719,7 +719,7 @@ endif # INSTALL_MOD_STRIP
 export mod_strip_cmd
 
 
-ifeq ($(CONFIG_MODULE_SIG),y)
+ifdef CONFIG_MODULE_SIG_ALL
 MODSECKEY = ./signing_key.priv
 MODPUBKEY = ./signing_key.x509
 export MODPUBKEY
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index fff4cb1321c5..88f334fb403b 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -1665,6 +1665,17 @@ config MODULE_SIG_FORCE
 	  Reject unsigned modules or signed modules for which we don't have a
 	  key.  Without this, such modules will simply taint the kernel.
 
+config MODULE_SIG_ALL
+	bool "Automatically sign all modules"
+	default y
+	depends on MODULE_SIG
+	help
+	  Sign all modules during make modules_install. Without this option,
+	  modules must be signed manually, using the scripts/sign-file tool.
+
+comment "Do not forget to sign required modules with scripts/sign-file"
+	depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
+
 choice
 	prompt "Which hash algorithm should modules be signed with?"
 	depends on MODULE_SIG