diff --git a/cpio/PKGBUILD b/cpio/PKGBUILD
index ce93a0049..020f20694 100644
--- a/cpio/PKGBUILD
+++ b/cpio/PKGBUILD
@@ -1,32 +1,31 @@
-#
-# Core Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
+# contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/cpio
 
 pkgname=cpio
 pkgver=2.11
-pkgrel=4
+pkgrel=5
 pkgdesc="A tool to copy files into or out of a cpio or tar archive"
-arch=(i686 x86_64)
+arch=(x86_64)
 license=('GPL')
 url="http://www.gnu.org/software/cpio"
 depends=('glibc')
-source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz)
+source=("ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz"
+        'cpio-2.11-stdio.in.patch')
 install=cpio.install
-md5sums=('1112bb6c45863468b5496ba128792f6c')
+md5sums=('1112bb6c45863468b5496ba128792f6c'
+         '9d1b41c96ed07083e69ea5e6b98e28d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1
-  mv ${pkgdir}/usr/bin ${pkgdir}/bin
+  make 
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/usr/libexec
-  # remove mt manpage it conflicts with mt-st from extra
-  rm $pkgdir/usr/share/man/man1/mt.1 || return 1
   # remove infodir
   rm $pkgdir/usr/share/info/dir
 }
diff --git a/cpio/cpio-2.11-stdio.in.patch b/cpio/cpio-2.11-stdio.in.patch
new file mode 100644
index 000000000..631aeaaec
--- /dev/null
+++ b/cpio/cpio-2.11-stdio.in.patch
@@ -0,0 +1,13 @@
+diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
+--- cpio-2.11-orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
++++ cpio-2.11/gnu/stdio.in.h	2012-06-04 10:23:23.804471185 +0200
+@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
\ No newline at end of file