diff --git a/app-arch/cpio/cpio-2.11.recipe b/app-arch/cpio/cpio-2.12.recipe
similarity index 88%
rename from app-arch/cpio/cpio-2.11.recipe
rename to app-arch/cpio/cpio-2.12.recipe
index ed87a2717..1d6a21d1a 100644
--- a/app-arch/cpio/cpio-2.11.recipe
+++ b/app-arch/cpio/cpio-2.12.recipe
@@ -10,11 +10,11 @@ with older cpio programs. When extracting from archives, cpio automatically \
 recognizes which kind of archive it is reading and can read archives created \
 on machines with a different byte-order."
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
-REVISION="2"
+REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-SOURCE_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.gz"
-CHECKSUM_SHA256="601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
+SOURCE_URI="http://ftp.gnu.org/gnu/cpio/cpio-$portVersion.tar.gz"
+CHECKSUM_SHA256="08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73"
 PATCHES="cpio-$portVersion.patchset"
 
 PROVIDES="
diff --git a/app-arch/cpio/patches/cpio-2.11.patchset b/app-arch/cpio/patches/cpio-2.12.patchset
similarity index 57%
rename from app-arch/cpio/patches/cpio-2.11.patchset
rename to app-arch/cpio/patches/cpio-2.12.patchset
index 8f6add5bf..b78d8f286 100644
--- a/app-arch/cpio/patches/cpio-2.11.patchset
+++ b/app-arch/cpio/patches/cpio-2.12.patchset
@@ -1,11 +1,11 @@
-From 849e148bbad050d073c062b31f353fc66e277e23 Mon Sep 17 00:00:00 2001
+From c93583f0201de8659fb138dbef6df33285ea2fee Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Tue, 14 Oct 2014 14:38:24 +0200
 Subject: Search for gethostbyname in libnetwork.
 
 
 diff --git a/configure.ac b/configure.ac
-index b4507eb..448fa6d 100644
+index c68bd44..c8f4645 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -47,6 +47,8 @@ AC_CHECK_TYPE(gid_t, int)
@@ -21,39 +21,17 @@ index b4507eb..448fa6d 100644
 1.8.3.4
 
 
-From d73864ea6ac27a18ef7897a036791746e2c3a883 Mon Sep 17 00:00:00 2001
+From da1282ba6f3f7f32bdc29107cf467b693372743d Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Tue, 14 Oct 2014 14:38:58 +0200
 Subject: gcc2 fixes.
 
 
-diff --git a/gnu/inttostr.c b/gnu/inttostr.c
-index d4f99cc..c7636d5 100644
---- a/gnu/inttostr.c
-+++ b/gnu/inttostr.c
-@@ -34,7 +34,6 @@ inttostr (inttype i, char *buf)
-   char *p = buf + INT_STRLEN_BOUND (inttype);
-   *p = 0;
- 
--  verify (TYPE_SIGNED (inttype) == inttype_is_signed);
- #if inttype_is_signed
-   if (i < 0)
-     {
-diff --git a/src/filetypes.h b/src/filetypes.h
-index f80faab..81f0c32 100644
---- a/src/filetypes.h
-+++ b/src/filetypes.h
-@@ -81,5 +81,3 @@
- #ifndef S_ISLNK
- #define lstat stat
- #endif
--int lstat ();
--int stat ();
 diff --git a/src/makepath.c b/src/makepath.c
-index 7631772..83f9c25 100644
+index 18d5b69..3244438 100644
 --- a/src/makepath.c
 +++ b/src/makepath.c
-@@ -65,10 +65,10 @@ make_path (char *argpath,
+@@ -66,10 +66,10 @@ make_path (char *argpath,
  
    if (stat (dirpath, &stats))
      {