diff --git a/cpio-2.5-nolibnsl.patch b/cpio-2.5-nolibnsl.patch
new file mode 100644
index 0000000..f219218
--- /dev/null
+++ b/cpio-2.5-nolibnsl.patch
@@ -0,0 +1,11 @@
+--- cpio-2.5/configure.lr	2003-09-12 06:26:31.000000000 -0600
++++ cpio-2.5/configure	2003-09-12 06:27:20.000000000 -0600
+@@ -1940,7 +1940,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lnsl  $LIBS"
++LIBS="-lXXXnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1945 "configure"
+ #include "confdefs.h"
diff --git a/cpio.spec b/cpio.spec
index cb602d9..95552d1 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -5,18 +5,18 @@
 
 Summary: A GNU archiving program.
 Name: cpio
-Version: 2.5.90
-Release: 3  
+Version: 2.5
+Release: 9
 License: GPL
 Group: Applications/Archiving
 URL: ftp://ftp.gnu.org/pub/gnu/cpio/
-Source: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.90.tar.gz
-Patch0: cpio-2.5.90-rh.patch
-Patch13: cpio-2.5.90-nolibnsl.patch
-Patch14: cpio-2.5.90-lfs.patch
-Patch15: cpio-2.5.90-throw.patch
-Patch16: cpio-2.5.90-optimize.patch
-Patch17: cpio-2.5.90-error.patch
+Source: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.tar.gz
+Patch0: cpio-2.5-rh.patch
+Patch10: cpio-2.4.2-freebsd.patch
+Patch11: cpio-2.4.2-bug56346.patch
+Patch12: cpio-2.5-i18n-0.1.patch
+Patch13: cpio-2.5-nolibnsl.patch
+Patch14: cpio-2.5-lfs.patch
 
 %ifnos linux
 Prereq: /sbin/rmt
@@ -42,12 +42,11 @@ Install cpio if you need a program to manage file archives.
 %prep
 %setup -q
 %patch0 -p1 -b .rh
-%patch13 -p1 -b .nolibnsl
+#%patch10 -p1 -b .fbsd
+#%patch11 -p1 -b .multilink
+%patch12 -p1 -b .i18n
+%patch13 -p1
 %patch14 -p1 -b .lfs
-%patch15 -p1 -b .throw
-%patch16 -p1 -b .optimize
-%patch17 -p1 -b .error
-
 
 %build
 
@@ -93,18 +92,8 @@ fi
 %{_mandir}/man*/*
 
 %{_infodir}/*.info*
-%{_datadir}/locale/*
 
 %changelog
-* Mon Nov 08 2004 Peter Vrabec <pvrabec@redhat.com>
-- add error 'n' optimize patch
-
-* Mon Nov 08 2004 Peter Vrabec <pvrabec@redhat.com>
-- add throw patch
-
-* Mon Nov 08 2004 Peter Vrabec <pvrabec@redhat.com>
-- update to 2.5.9
-
 * Mon Nov 01 2004 Peter Vrabec <pvrabec@redhat.com>
 - support large files > 2GB (#105617)
 
diff --git a/sources b/sources
index 889695d..31637e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-541eeb1bc5e2e7ac2545d3112a878018  cpio-2.5.90.tar.gz
+e02859af1bbbbd73fcbf757acb57e0a4  cpio-2.5.tar.gz