diff --git a/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL b/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL
new file mode 100644
index 000000000..3ef6722b0
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_JUMP_LABEL
@@ -0,0 +1 @@
+# CONFIG_JUMP_LABEL is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 36bcd8012..6487de662 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2340,7 +2340,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_ZHENHUA=m
 # CONFIG_JSA1212 is not set
-CONFIG_JUMP_LABEL=y
+# CONFIG_JUMP_LABEL is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e5415f0f1..13857bbe4 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2323,7 +2323,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_ZHENHUA=m
 # CONFIG_JSA1212 is not set
-CONFIG_JUMP_LABEL=y
+# CONFIG_JUMP_LABEL is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
diff --git a/kernel.spec b/kernel.spec
index 35096ec8b..d9254f670 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -329,7 +329,7 @@ Summary: The Linux kernel
 # Which is a BadThing(tm).
 
 # We only build kernel-headers on the following...
-%define nobuildarches i386 s390x
+%define nobuildarches i386
 
 %ifarch %nobuildarches
 %define with_up 0