diff --git a/squeeze/data/etch/exclude-udebs-s390 b/squeeze/data/etch/exclude-udebs-s390
deleted file mode 100644
index e075e4bc..00000000
--- a/squeeze/data/etch/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# S/390 does not support loading udebs off the CD image,
-# so we can exclude all udebs from it
-*
diff --git a/squeeze/data/lenny/exclude-udebs-s390 b/squeeze/data/lenny/exclude-udebs-s390
deleted file mode 100644
index e075e4bc..00000000
--- a/squeeze/data/lenny/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# S/390 does not support loading udebs off the CD image,
-# so we can exclude all udebs from it
-*
diff --git a/squeeze/data/squeeze/exclude-udebs-s390 b/squeeze/data/squeeze/exclude-udebs-s390
deleted file mode 100644
index e075e4bc..00000000
--- a/squeeze/data/squeeze/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# S/390 does not support loading udebs off the CD image,
-# so we can exclude all udebs from it
-*
diff --git a/squeeze/debian/changelog b/squeeze/debian/changelog
index 4c73627c..50c7492c 100644
--- a/squeeze/debian/changelog
+++ b/squeeze/debian/changelog
@@ -55,6 +55,9 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
     directory.
   * Describe discs appropriately depending on the kernel used.
     Closes: #673975
+  * Don't exclude all the udebs for s390. Some users really do need them
+    (loading from a CD/DVD used over the network). Closes: Bug #673576
+  * Explicitly add s390-tools and sysconfig-hardware for s390.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 04 Feb 2011 09:59:21 +0100
 
diff --git a/squeeze/tools/generate_di+k_list b/squeeze/tools/generate_di+k_list
index 3c9b7b03..ac5a3b8b 100755
--- a/squeeze/tools/generate_di+k_list
+++ b/squeeze/tools/generate_di+k_list
@@ -303,4 +303,8 @@ grub-pc
 libc0.1-i686
 #endif
 
+#if defined(ARCH_s390) || defined(ARCH_s390x)
+s390-tools
+sysconfig-hardware
+#endif
 EOF