diff --git a/cpio-2.9-avoid_overflow_warning.patch b/cpio-2.9-avoid_overflow_warning.patch
new file mode 100644
index 0000000..8cf44b3
--- /dev/null
+++ b/cpio-2.9-avoid_overflow_warning.patch
@@ -0,0 +1,11 @@
+--- src/tar.c
++++ src/tar.c
+@@ -217,7 +217,7 @@
+       char *name;
+ 
+       strncpy (tar_hdr->magic, TMAGIC, TMAGLEN);
+-      strncpy (tar_hdr->magic + TMAGLEN, TVERSION, TVERSLEN);
++      strncpy (tar_hdr->version, TVERSION, TVERSLEN);
+ 
+       name = getuser (file_hdr->c_uid);
+       if (name)
diff --git a/cpio.changes b/cpio.changes
index 4d74e59..28caa27 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 23 16:13:15 CEST 2007 - lmichnovic@suse.cz
+
+- rewrote code which uses overflow to copy string in structure and
+  gcc was complaining about it (*avoid_overflow_warning.patch)
+
 -------------------------------------------------------------------
 Mon Oct  1 11:31:02 CEST 2007 - lmichnovic@suse.cz
 
diff --git a/cpio.spec b/cpio.spec
index f5ec9e9..3d46d48 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -16,7 +16,7 @@ License:        GPL v3 only
 Group:          Productivity/Archiving/Compression
 AutoReqProv:    on
 Version:        2.9
-Release:        18
+Release:        21
 Summary:        A Backup and Archiving Utility
 Source:         cpio-2.9.tar.bz2
 Patch1:         cpio-2.9-no_rmt.patch
@@ -29,6 +29,7 @@ Patch7:         cpio-2.9-chmodRaceC.patch
 Patch8:         cpio-2.9-paxlib-owl-alloca.patch
 Patch9:         cpio-2.9-gcc4_3.patch
 Patch10:        cpio-2.9-segfault_in_copyin.patch
+Patch11:        cpio-2.9-avoid_overflow_warning.patch
 PreReq:         %install_info_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -63,6 +64,7 @@ Authors:
 %patch8
 %patch9
 %patch10
+%patch11
 chmod 755 .
 chmod u+w *
 chmod a+r *
@@ -102,6 +104,9 @@ ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio
 %doc %{_mandir}/man1/mt.1.gz
 #/usr/share/locale/*/LC_MESSAGES/cpio.mo
 %changelog
+* Tue Oct 23 2007 - lmichnovic@suse.cz
+- rewrote code which uses overflow to copy string in structure and
+  gcc was complaining about it (*avoid_overflow_warning.patch)
 * Mon Oct 01 2007 - lmichnovic@suse.cz
 - Fixed typo in copin.c causing segfault [#329744]
   (*segfault_in_copyin.patch)