diff --git a/debian/changelog b/debian/changelog
index 43acb1ff7..3d7988b3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
   * Enable POWER_SUPPLY, BLK_DEV_THROTTLING and NETPRIO_CGROUP.
   * [amd64] Enable CRYPTO_CAMELLIA_X86_64, CRYPTO_SERPENT_AVX_X86_64 and
     CRYPTO_TWOFISH_AVX_X86_64.
-  * [x86]: Enable more platform drivers.
+  * [x86] Enable more platform drivers.
+  * [s390/s390x-tape, s390x/s390x-tape] Remove not longer supported image
+    variant.
 
  -- Bastian Blank <waldi@debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 
diff --git a/debian/config/s390/config.s390 b/debian/config/s390/config.s390
index a6e9ae151..58ae4e980 100644
--- a/debian/config/s390/config.s390
+++ b/debian/config/s390/config.s390
@@ -8,10 +8,6 @@ CONFIG_MARCH_G5=y
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
 ## end choice
-## choice: IPL method generated into head.S
-# CONFIG_IPL_TAPE is not set
-CONFIG_IPL_VM=y
-## end choice
 
 ##
 ## file: fs/btrfs/Kconfig
diff --git a/debian/config/s390/config.s390-tape b/debian/config/s390/config.s390-tape
deleted file mode 100644
index 2c77cc4c1..000000000
--- a/debian/config/s390/config.s390-tape
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## file: arch/s390/Kconfig
-##
-# CONFIG_64BIT is not set
-## choice: Processor type
-CONFIG_MARCH_G5=y
-# CONFIG_MARCH_Z900 is not set
-# CONFIG_MARCH_Z990 is not set
-# CONFIG_MARCH_Z9_109 is not set
-## end choice
-## choice: IPL method generated into head.S
-CONFIG_IPL_TAPE=y
-# CONFIG_IPL_VM is not set
-## end choice
-
diff --git a/debian/config/s390/config.s390x b/debian/config/s390/config.s390x
index b372d7fa2..fd4633975 100644
--- a/debian/config/s390/config.s390x
+++ b/debian/config/s390/config.s390x
@@ -10,9 +10,3 @@ CONFIG_MARCH_Z900=y
 # CONFIG_MARCH_Z10 is not set
 ## end choice
 
-##
-## file: unknown
-##
-# CONFIG_IPL_TAPE is not set
-CONFIG_IPL_VM=y
-
diff --git a/debian/config/s390/config.s390x-tape b/debian/config/s390/config.s390x-tape
deleted file mode 100644
index a88a6c8ff..000000000
--- a/debian/config/s390/config.s390x-tape
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## file: arch/s390/Kconfig
-##
-CONFIG_64BIT=y
-## choice: Processor type
-# CONFIG_MARCH_G5 is not set
-CONFIG_MARCH_Z900=y
-# CONFIG_MARCH_Z990 is not set
-# CONFIG_MARCH_Z9_109 is not set
-# CONFIG_MARCH_Z10 is not set
-## end choice
-
-##
-## file: unknown
-##
-CONFIG_IPL_TAPE=y
-# CONFIG_IPL_VM is not set
-
diff --git a/debian/config/s390/defines b/debian/config/s390/defines
index 88fcf4f12..4d9c37532 100644
--- a/debian/config/s390/defines
+++ b/debian/config/s390/defines
@@ -1,49 +1,17 @@
 [base]
 flavours:
  s390x
- s390x-tape
 kernel-arch: s390
 
-[description]
-part-long-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
-part-long-tape: This kernel has support to IPL (boot) from a tape.
-part-short-tape: IPL from tape
-
 [image]
 bootloaders: s390-tools
 
 [s390_description]
 hardware: IBM S/390
-parts: reader
-
-[s390-tape_build]
-modules: false
-
-[s390-tape_description]
-hardware: IBM S/390
-parts: tape
-
-[s390-tape_image]
-initramfs: false
-override-localversion: s390
-type: plain-s390-tape
 
 [s390x_build]
 debug-info: true
 
 [s390x_description]
 hardware: IBM zSeries
-parts: reader
-
-[s390x-tape_build]
-modules: false
-
-[s390x-tape_description]
-hardware: IBM zSeries
-parts: tape
-
-[s390x-tape_image]
-initramfs: false
-override-localversion: s390x
-type: plain-s390-tape
 
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 4d95550aa..48ab2b7d0 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -1,14 +1,8 @@
 [base]
 flavours:
  s390x
- s390x-tape
 kernel-arch: s390
 
-[description]
-part-long-reader: This kernel has support to IPL (boot) from a VM reader or DASD device.
-part-long-tape: This kernel has support to IPL (boot) from a tape.
-part-short-tape: IPL from tape
-
 [image]
 bootloaders: s390-tools
 configs: s390/config
@@ -18,21 +12,7 @@ debug-info: true
 
 [s390x_description]
 hardware: IBM zSeries
-parts: reader
 
 [s390x_image]
 configs: s390/config.s390x
 
-[s390x-tape_build]
-modules: false
-
-[s390x-tape_description]
-hardware: IBM zSeries
-parts: tape
-
-[s390x-tape_image]
-configs: s390/config.s390x-tape
-initramfs: false
-override-localversion: s390x
-type: plain-s390-tape
-
diff --git a/debian/installer/s390/kernel-versions b/debian/installer/s390/kernel-versions
index d130e0e41..e2806b116 100644
--- a/debian/installer/s390/kernel-versions
+++ b/debian/installer/s390/kernel-versions
@@ -1,3 +1,2 @@
 # arch version flavour    installedname suffix build-depends
 s390   -       s390x      -             -      -
-s390   -       s390x-tape -             -tape  -
diff --git a/debian/installer/s390/modules/s390x-tape/kernel-image b/debian/installer/s390/modules/s390x-tape/kernel-image
deleted file mode 100644
index 1bb8bf6d7..000000000
--- a/debian/installer/s390/modules/s390x-tape/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/debian/installer/s390x/kernel-versions b/debian/installer/s390x/kernel-versions
index dff5e12c5..bbe139d5a 100644
--- a/debian/installer/s390x/kernel-versions
+++ b/debian/installer/s390x/kernel-versions
@@ -1,3 +1,2 @@
 # arch version flavour    installedname suffix build-depends
 s390x  -       s390x      -             -      -
-s390x  -       s390x-tape -             -tape  -
diff --git a/debian/installer/s390x/modules/s390x-tape/kernel-image b/debian/installer/s390x/modules/s390x-tape/kernel-image
deleted file mode 100644
index 1bb8bf6d7..000000000
--- a/debian/installer/s390x/modules/s390x-tape/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-# empty