diff --git a/config-s390x b/config-s390x
index c0ae0aa0a..99c16ef96 100644
--- a/config-s390x
+++ b/config-s390x
@@ -260,6 +260,14 @@ CONFIG_HOTPLUG_PCI_S390=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 
-# CONFIG_PCI is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_DRM is not set
+# CONFIG_SOUND is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_NFORCE2 is not set
diff --git a/kernel.spec b/kernel.spec
index 7f5efc19d..9ce9a94e3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2285,6 +2285,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Mar 18 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc3.git0.4
+- s390x config option changes from Dan Horák <dan@danny.cz>
+   - enable PCI
+   - disable few useless drivers
+   - disable drivers conflicting with s390x
+
 * Mon Mar 18 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc3.git0.3
 - Linux v3.9-rc3
   merged: w1-fix-oops-when-w1_search-is-called-from.patch