diff --git a/patch-parse.patch b/patch-parse.patch
new file mode 100644
index 0000000..cbd97fa
--- /dev/null
+++ b/patch-parse.patch
@@ -0,0 +1,12 @@
+--- patch-2.5.4/partime.c.parse	1998-03-15 15:48:53.000000000 +0000
++++ patch-2.5.4/partime.c	2005-09-07 08:04:41.000000000 +0000
+@@ -792,7 +792,8 @@
+ 	if (negative)
+ 	  n = -n;
+ 	while (!ISALNUM ((unsigned char) *s))
+-	  s++;
++	  if (*s++ == '\0')
++	    return 0;
+ 	i = lookup (s, relative_units);
+ 	if (!TM_DEFINED (i))
+ 	  return 0;
diff --git a/patch.spec b/patch.spec
index c4650ad..00884ca 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 26
+Release: 27
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -13,6 +13,7 @@ Patch4: patch-2.5.4-ifdef.patch
 Patch5: patch-2.5.4-program_name.patch
 Patch6: patch-stripcr.patch
 Patch7: patch-selinux.patch
+Patch8: patch-parse.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -34,6 +35,7 @@ applications.
 %patch5 -p1 -b .program_name
 %patch6 -p1 -b .stripcr
 %patch7 -p1 -b .selinux
+%patch8 -p1 -b .parse
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Sep  7 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-27
+- Applied patch from Ulrich Drepper to fix string overread (bug #118536).
+
 * Tue Sep  6 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-26
 - Preserve SELinux file contexts (bug #165799).