diff --git a/byacc.spec b/byacc.spec
index 562624d..7485ad8 100644
--- a/byacc.spec
+++ b/byacc.spec
@@ -3,7 +3,7 @@
 Summary: Berkeley Yacc, a parser generator
 Name: byacc
 Version: 1.9.%{byaccdate}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: Development/Tools
 URL: http://invisible-island.net/byacc/byacc.html
@@ -20,7 +20,7 @@ this package.
 
 %prep
 %setup -q -n byacc-%{byaccdate}
-%patch1 -p3
+%patch1 -p1
 
 %build
 %configure --disable-dependency-tracking
@@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/byacc.1*
 
 %changelog
-* Mon Jul 14 2008 Petr Machata <pmachata@redhat.com> - 1.9.20070509-3
+* Mon Jul 14 2008 Petr Machata <pmachata@redhat.com> - 1.9.20070509-4
 - Add a patch that fixes ancient buffer overflow
 - Related: #454583
 
diff --git a/skeleton.c.diff b/skeleton.c.diff
index 708b46c..a8f2b50 100644
--- a/skeleton.c.diff
+++ b/skeleton.c.diff
@@ -1,17 +1,15 @@
-===================================================================
-RCS file: /usr/OpenBSD/cvs/src/usr.bin/yacc/skeleton.c,v
-retrieving revision 1.28
-retrieving revision 1.29
-diff -u -r1.28 -r1.29
---- src/usr.bin/yacc/skeleton.c	2007/09/03 21:14:58	1.28
-+++ src/usr.bin/yacc/skeleton.c	2008/07/08 15:06:50	1.29
-@@ -63,4 +63,5 @@
+diff -urp byacc-20070509/skeleton.c byacc-20070509-pm/skeleton.c
+--- byacc-20070509/skeleton.c	2005-05-05 01:39:36.000000000 +0200
++++ byacc-20070509-pm/skeleton.c	2008-07-14 13:03:36.000000000 +0200
+@@ -21,6 +21,7 @@ char *banner[] =
      "#endif",
+     "",
      "#include <stdlib.h>",
 +    "#include <string.h>",
+     "",
      "#define YYBYACC 1",
-     "#define YYMAJOR 1",
-@@ -346,7 +347,10 @@
+     CONCAT1("#define YYMAJOR ", YYMAJOR),
+@@ -275,7 +276,10 @@ char *body[] =
      "                YYPREFIX, yystate, yyn, yyrule[yyn]);",
      "#endif",
      "    yym = yylen[yyn];",
@@ -23,3 +21,4 @@ diff -u -r1.28 -r1.29
      "    switch (yyn)",
      "    {",
      0
+Only in byacc-20070509-pm/: skeleton.c~