diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 9015060919a0430cd5b8233081f2e12f4c3e2547..39799fac4d7a6c02a89fa746d586e0aea95ca50a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -217,7 +217,7 @@ config COMPAT
 	def_bool y
 	prompt "Kernel support for 31 bit emulation"
 	depends on 64BIT
-	select COMPAT_BINFMT_ELF
+	select COMPAT_BINFMT_ELF if BINFMT_ELF
 	select ARCH_WANT_OLD_COMPAT_IPC
 	help
 	  Select this option if you want to enable your system kernel to