diff --git a/share/ramdisk.ltmpl b/share/ramdisk.ltmpl
index 9d3c6177..eceb98ba 100644
--- a/share/ramdisk.ltmpl
+++ b/share/ramdisk.ltmpl
@@ -12,6 +12,7 @@ install "kernel"
 
 ## x86 specific packages
 % if basearch == "i386" or basearch == "x86_64":
+    install "biosdevname"
     install "efibootmgr"
     install "firstaidkit-plugin-grub"
     install "grub"
@@ -20,25 +21,22 @@ install "kernel"
 
 ## ppc specific packages
 % if basearch == "ppc":
-    install "pcmciautils"
-    install "pdisk"
-    install "yaboot"
+    install "fbset"
     install "hfsutils"
     install "kernel-bootwrapper"
-    install "fbset"
+    install "pcmciautils"
+    install "pdisk"
     install "ppc64-utils"
+    install "yaboot"
 % endif
 
 ## s390 specific packages
-% if basearch == "s390" or basearch == "s390x":
-    install "binutils"
-    install "login"
+% if basearch == "s390x":
     install "lsscsi"
     install "modutils"
     install "mount"
-    install "portmap"
-    install "s390utils"
-    install "xorg-x11-libs"
+    install "s390utils-base"
+    install "s390utils-cmsfs"
 % endif
 
 ## sparc specific packages
@@ -55,7 +53,6 @@ install "at-spi2-atk"
 install "audit"
 install "bind-libs"
 install "bind-utils"
-install "biosdevname"
 install "bitmap-fangsongti-fonts"
 install "btrfs-progs"
 install "bzip2-libs"
@@ -81,7 +78,6 @@ install "gnome-icon-theme-legacy"
 install "gnome-keyring"
 install "gnome-python2-bonobo"
 install "gnome-python2-gconf"
-##install "gnome-themes-legacy"
 install "gnome-themes-standard"
 install "gobject-introspection"
 install "groff"
@@ -116,7 +112,6 @@ install "man-db"
 install "metacity"
 install "mt-st"
 install "mtr"
-#install "network-manager-netbook"
 install "nfs-utils"
 install "notification-daemon"
 install "ntfs-3g"
@@ -158,49 +153,6 @@ install "volume_key-libs"
 install "wget"
 install "xfsprogs"
 install "xorg-x11-drivers"
-##install "xorg-x11-drv-acecad"
-##install "xorg-x11-drv-aiptek"
-##install "xorg-x11-drv-apm"
-##install "xorg-x11-drv-ast"
-##install "xorg-x11-drv-ati"
-##install "xorg-x11-drv-cirrus"
-##install "xorg-x11-drv-dummy"
-##install "xorg-x11-drv-elographics"
-##install "xorg-x11-drv-evdev"
-##install "xorg-x11-drv-fbdev"
-##install "xorg-x11-drv-fpit"
-##install "xorg-x11-drv-glint"
-##install "xorg-x11-drv-hyperpen"
-##install "xorg-x11-drv-i128"
-##install "xorg-x11-drv-i740"
-##install "xorg-x11-drv-intel"
-##install "xorg-x11-drv-keyboard"
-##install "xorg-x11-drv-mach64"
-##install "xorg-x11-drv-mga"
-##install "xorg-x11-drv-mouse"
-##install "xorg-x11-drv-mutouch"
-##install "xorg-x11-drv-nouveau"
-##install "xorg-x11-drv-nv"
-##install "xorg-x11-drv-openchrome"
-##install "xorg-x11-drv-penmount"
-##install "xorg-x11-drv-qxl"
-##install "xorg-x11-drv-r128"
-##install "xorg-x11-drv-rendition"
-##install "xorg-x11-drv-s3virge"
-##install "xorg-x11-drv-savage"
-##install "xorg-x11-drv-siliconmotion"
-##install "xorg-x11-drv-sis"
-##install "xorg-x11-drv-sisusb"
-##install "xorg-x11-drv-synaptics"
-##install "xorg-x11-drv-tdfx"
-##install "xorg-x11-drv-trident"
-##install "xorg-x11-drv-v4l"
-##install "xorg-x11-drv-vesa"
-##install "xorg-x11-drv-vmmouse"
-##install "xorg-x11-drv-vmware"
-##install "xorg-x11-drv-void"
-##install "xorg-x11-drv-voodoo"
-##install "xorg-x11-drv-wacom"
 install "xorg-x11-fonts-ethiopic"
 install "xorg-x11-fonts-misc"
 install "xorg-x11-server-Xorg"
@@ -210,24 +162,26 @@ install "${product}-logos"
 install "${product}-release"
 
 ## required firmware
-install "aic94xx-firmware"
-install "ar9170-firmware"
-install "atmel-firmware"
-install "ipw2100-firmware"
-install "ipw2200-firmware"
-install "iwl1000-firmware"
-install "iwl3945-firmware"
-install "iwl4965-firmware"
-install "iwl5000-firmware"
-install "iwl5150-firmware"
-install "iwl6000-firmware"
-install "iwl6050-firmware"
-install "ql2100-firmware"
-install "ql2200-firmware"
-install "ql23xx-firmware"
-install "ql2400-firmware"
-install "ql2500-firmware"
-install "zd1211-firmware"
+% if basearch != "s390x":
+    install "aic94xx-firmware"
+    install "ar9170-firmware"
+    install "atmel-firmware"
+    install "ipw2100-firmware"
+    install "ipw2200-firmware"
+    install "iwl1000-firmware"
+    install "iwl3945-firmware"
+    install "iwl4965-firmware"
+    install "iwl5000-firmware"
+    install "iwl5150-firmware"
+    install "iwl6000-firmware"
+    install "iwl6050-firmware"
+    install "ql2100-firmware"
+    install "ql2200-firmware"
+    install "ql23xx-firmware"
+    install "ql2400-firmware"
+    install "ql2500-firmware"
+    install "zd1211-firmware"
+% endif
 
 ## required directories
 mkdir "/var/run/dbus"
@@ -507,6 +461,13 @@ module "xfs"
 module "xts"
 module "yenta_socket"
 
+## s390 modules
+% if basearch == "s390x":
+    module "dasd_eckd_mod"
+    module "dasd_fba_mod"
+    module "dasd_diag_mod"
+% endif
+
 ## other removals
 remove --path "/usr/share/doc"
 remove --path "/usr/share/info"