diff --git a/cpio-2.10-DAT160.patch b/cpio-2.10-DAT160.patch
deleted file mode 100644
index 268a3a1..0000000
--- a/cpio-2.10-DAT160.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cpio-2.6/src/mt.c
-===================================================================
---- cpio-2.6.orig/src/mt.c
-+++ cpio-2.6/src/mt.c
-@@ -181,6 +181,7 @@ struct densities {
-   {0x16, "MFM 10000 bpi"},
-   {0x17, "MFM 42500 bpi"},
-   {0x24, "DDS-2"},
-+  {0x48, "DAT160"},
-   {140, "EXB-8505 compressed"},
-   {144, "EXB-8205 compressed"},
-   {-1, NULL}};
diff --git a/cpio-2.10-mt.patch b/cpio-2.10-mt.patch
index 7a7ca76..a55a500 100644
--- a/cpio-2.10-mt.patch
+++ b/cpio-2.10-mt.patch
@@ -200,7 +200,7 @@
 +
 +#include <configmake.h>
  
-@@ -105,6 +147,43 @@
+@@ -105,6 +151,85 @@
  void exit ();
  #endif
  
@@ -216,6 +216,7 @@
 +  {0x01, "NRZI (800 bpi)"},
 +  {0x02, "PE (1600 bpi)"},
 +  {0x03, "GCR (6250 bpi)"},
++  {0x04, "QIC-11"},
 +  {0x05, "QIC-45/60 (GCR, 8000 bpi)"},
 +  {0x06, "PE (3200 bpi)"},
 +  {0x07, "IMFM (6400 bpi)"},
@@ -234,9 +235,50 @@
 +  {0x15, "EXB-8500 (RLL 45434 bpi)"},
 +  {0x16, "MFM 10000 bpi"},
 +  {0x17, "MFM 42500 bpi"},
++  {0x18, "TZ86"},
++  {0x19, "DLT 10GB"},
++  {0x1a, "DLT 20GB"},
++  {0x1b, "DLT 35GB"},
++  {0x1c, "QIC-385M"},
++  {0x1d, "QIC-410M"},
++  {0x1e, "QIC-1000C"},
++  {0x1f, "QIC-2100C"},
++  {0x20, "QIC-6GB"},
++  {0x21, "QIC-20GB"},
++  {0x22, "QIC-2GB"},
++  {0x23, "QIC-875"},
 +  {0x24, "DDS-2"},
-+  {140, "EXB-8505 compressed"},
-+  {144, "EXB-8205 compressed"},
++  {0x25, "DDS-3"},
++  {0x26, "DDS-4 or QIC-4GB"},
++  {0x27, "Exabyte Mammoth"},
++  {0x28, "Exabyte Mammoth-2"},
++  {0x29, "QIC-3080MC"},
++  {0x30, "AIT-1 or MLR3"},
++  {0x31, "AIT-2"},
++  {0x32, "AIT-3"},
++  {0x33, "SLR6"},
++  {0x34, "SLR100"},
++  {0x40, "DLT1 40 GB, or Ultrium"},
++  {0x41, "DLT 40GB, or Ultrium2"},
++  {0x42, "LTO-2"},
++  {0x45, "QIC-3095-MC (TR-4)"},
++  {0x47, "TR-5"},
++  {0x48, "DAT160"},
++  {0x80, "DLT 15GB uncomp. or Ecrix"},
++  {0x81, "DLT 15GB compressed"},
++  {0x82, "DLT 20GB uncompressed"},
++  {0x83, "DLT 20GB compressed"},
++  {0x84, "DLT 35GB uncompressed"},
++  {0x85, "DLT 35GB compressed"},
++  {0x86, "DLT1 40 GB uncompressed"},
++  {0x87, "DLT1 40 GB compressed"},
++  {0x88, "DLT 40GB uncompressed"},
++  {0x89, "DLT 40GB compressed"},
++  {0x8c, "EXB-8505 compressed"},
++  {0x90, "SDLT110 uncompr/EXB-8205 compr"},
++  {0x91, "SDLT110 compressed"},
++  {0x92, "SDLT160 uncompressed"},
++  {0x93, "SDLT160 comprssed"},
 +  {-1, NULL}};
 +#endif
 +
diff --git a/cpio.changes b/cpio.changes
index b91b511..a5da146 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 10 16:53:33 CEST 2009 - mseben@novell.com
+
+- merged DAT160.patch with mt.patch
+- added other tape density definitions from mt_st package (bnc#523357)
+
 -------------------------------------------------------------------
 Fri Jul 17 16:00:52 CEST 2009 - rguenther@suse.de
 
diff --git a/cpio.spec b/cpio.spec
index 333af6b..b9d1f41 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -24,7 +24,7 @@ License:        GPL v3 only
 Group:          Productivity/Archiving/Compression
 AutoReqProv:    on
 Version:        2.10
-Release:        2
+Release:        3
 Summary:        A Backup and Archiving Utility
 Source:         %{name}-%{version}.tar.bz2
 Patch2:         %{name}-%{version}-use_new_ascii_format.patch
@@ -41,8 +41,6 @@ Patch17:        %{name}-%{version}-dev_number.patch
 Patch18:        %{name}-%{version}-default_tape_dev.patch
 #PATCH-FIX-UPSTREAM include_fatal_c.patch fix undefined ref in mt build
 Patch19:        %{name}-%{version}-include_fatal_c.patch
-#PATCH-FIX-UPSTREAM fix identification of the density code for DAT160 bnc#415166
-Patch20:        %{name}-%{version}-DAT160.patch
 PreReq:         %install_info_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
@@ -79,7 +77,6 @@ Authors:
 %patch17
 %patch18
 %patch19
-%patch20 -p1
 #chmod 755 .
 #chmod u+w *
 #chmod a+r *