diff --git a/debian/changelog b/debian/changelog
index 2e8eca1bb..e43c97f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low
   * [x86] Enable HYPERVISOR_GUEST
   * udeb: Move i2c-algo-bit to i2c-modules
   * udeb: Remove redundant control file overrides
+  * [s390] udeb: Use symlinks to follow s390x configuration
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
 
diff --git a/debian/installer/s390/modules b/debian/installer/s390/modules
new file mode 120000
index 000000000..1d9867999
--- /dev/null
+++ b/debian/installer/s390/modules
@@ -0,0 +1 @@
+../s390x/modules
\ No newline at end of file
diff --git a/debian/installer/s390/modules/s390x/core-modules b/debian/installer/s390/modules/s390x/core-modules
deleted file mode 100644
index 892a30fa4..000000000
--- a/debian/installer/s390/modules/s390x/core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <core-modules>
-vmcp ?
diff --git a/debian/installer/s390/modules/s390x/crypto-dm-modules b/debian/installer/s390/modules/s390x/crypto-dm-modules
deleted file mode 100644
index 4c8f2354c..000000000
--- a/debian/installer/s390/modules/s390x/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-dm-modules>
diff --git a/debian/installer/s390/modules/s390x/crypto-modules b/debian/installer/s390/modules/s390x/crypto-modules
deleted file mode 100644
index 3a1e862b4..000000000
--- a/debian/installer/s390/modules/s390x/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-modules>
diff --git a/debian/installer/s390/modules/s390x/dasd-extra-modules b/debian/installer/s390/modules/s390x/dasd-extra-modules
deleted file mode 100644
index ddd10cdfb..000000000
--- a/debian/installer/s390/modules/s390x/dasd-extra-modules
+++ /dev/null
@@ -1 +0,0 @@
-dasd_diag_mod
diff --git a/debian/installer/s390/modules/s390x/dasd-modules b/debian/installer/s390/modules/s390x/dasd-modules
deleted file mode 100644
index d3df219e7..000000000
--- a/debian/installer/s390/modules/s390x/dasd-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-dasd_eckd_mod
-dasd_fba_mod
diff --git a/debian/installer/s390/modules/s390x/ext2-modules b/debian/installer/s390/modules/s390x/ext2-modules
deleted file mode 100644
index bbaebc8f1..000000000
--- a/debian/installer/s390/modules/s390x/ext2-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext2-modules>
-
diff --git a/debian/installer/s390/modules/s390x/ext3-modules b/debian/installer/s390/modules/s390x/ext3-modules
deleted file mode 100644
index 55ef7d7bc..000000000
--- a/debian/installer/s390/modules/s390x/ext3-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext3-modules>
-
diff --git a/debian/installer/s390/modules/s390x/ext4-modules b/debian/installer/s390/modules/s390x/ext4-modules
deleted file mode 100644
index 394c577ce..000000000
--- a/debian/installer/s390/modules/s390x/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <ext4-modules>
diff --git a/debian/installer/s390/modules/s390x/fat-modules b/debian/installer/s390/modules/s390x/fat-modules
deleted file mode 100644
index cce8fd30c..000000000
--- a/debian/installer/s390/modules/s390x/fat-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <fat-modules>
-
diff --git a/debian/installer/s390/modules/s390x/fuse-modules b/debian/installer/s390/modules/s390x/fuse-modules
deleted file mode 100644
index 0b6ba0c8c..000000000
--- a/debian/installer/s390/modules/s390x/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <fuse-modules>
diff --git a/debian/installer/s390/modules/s390x/kernel-image b/debian/installer/s390/modules/s390x/kernel-image
deleted file mode 100644
index 1bb8bf6d7..000000000
--- a/debian/installer/s390/modules/s390x/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/debian/installer/s390/modules/s390x/md-modules b/debian/installer/s390/modules/s390x/md-modules
deleted file mode 100644
index ade088ddb..000000000
--- a/debian/installer/s390/modules/s390x/md-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <md-modules>
-
diff --git a/debian/installer/s390/modules/s390x/multipath-modules b/debian/installer/s390/modules/s390x/multipath-modules
deleted file mode 100644
index a8b69b253..000000000
--- a/debian/installer/s390/modules/s390x/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <multipath-modules>
diff --git a/debian/installer/s390/modules/s390x/nbd-modules b/debian/installer/s390/modules/s390x/nbd-modules
deleted file mode 100644
index 3c9b3e5d4..000000000
--- a/debian/installer/s390/modules/s390x/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nbd-modules>
diff --git a/debian/installer/s390/modules/s390x/nic-modules b/debian/installer/s390/modules/s390x/nic-modules
deleted file mode 100644
index 32056514d..000000000
--- a/debian/installer/s390/modules/s390x/nic-modules
+++ /dev/null
@@ -1,6 +0,0 @@
-netiucv
-ctcm
-lcs
-qeth
-qeth_l2
-qeth_l3
diff --git a/debian/installer/s390/modules/s390x/scsi-core-modules b/debian/installer/s390/modules/s390x/scsi-core-modules
deleted file mode 100644
index 3537f8234..000000000
--- a/debian/installer/s390/modules/s390x/scsi-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <scsi-core-modules>
-
diff --git a/debian/installer/s390/modules/s390x/scsi-modules b/debian/installer/s390/modules/s390x/scsi-modules
deleted file mode 100644
index 1f0171d7e..000000000
--- a/debian/installer/s390/modules/s390x/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@
-zfcp
diff --git a/debian/installer/s390/modules/s390x/virtio-modules b/debian/installer/s390/modules/s390x/virtio-modules
deleted file mode 100644
index 61da39659..000000000
--- a/debian/installer/s390/modules/s390x/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <virtio-modules>
diff --git a/debian/installer/s390/modules/s390x/xfs-modules b/debian/installer/s390/modules/s390x/xfs-modules
deleted file mode 100644
index c020b5d39..000000000
--- a/debian/installer/s390/modules/s390x/xfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <xfs-modules>
-
diff --git a/debian/installer/s390/package-list b/debian/installer/s390/package-list
deleted file mode 100644
index 74d4691e1..000000000
--- a/debian/installer/s390/package-list
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used to build up the control file. The kernel version and
-# "-di" are appended to the package names. Section can be left out. So can
-# architecture, which is derived from the files in the modules directory.
-# It overwrites specifications from /usr/share/kernel-wedge/package-list.
-#
-
-Package: dasd-modules
-Depends: kernel-image
-Priority: standard
-Description: dasd modules
- This package contains dasd modules.
-
-Package: dasd-extra-modules
-Depends: kernel-image, dasd-modules
-Priority: extra
-Description: optional dasd DIAG support
- This package contains the module for dasd DIAG support. The udeb is
- not loaded by default as the installer does not actually support this.
- It can however be useful to have available in rescue situations.
diff --git a/debian/installer/s390/package-list b/debian/installer/s390/package-list
new file mode 120000
index 000000000..d51578547
--- /dev/null
+++ b/debian/installer/s390/package-list
@@ -0,0 +1 @@
+../s390x/package-list
\ No newline at end of file