diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 043f5d8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: flex
-# $Id: Makefile,v 1.2 2007/10/15 18:45:30 notting Exp $
-NAME := flex
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/flex-2.5.35-missing-prototypes.patch b/flex-2.5.35-missing-prototypes.patch
new file mode 100644
index 0000000..5cde066
--- /dev/null
+++ b/flex-2.5.35-missing-prototypes.patch
@@ -0,0 +1,53 @@
+diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
+--- flex-2.5.35/flex.skl~	2010-07-13 17:18:43.000000000 +0200
++++ flex-2.5.35/flex.skl	2010-07-13 17:23:49.000000000 +0200
+@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
+ void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
+ ]])
+ 
++m4_ifdef( [[M4_YY_REENTRANT]],
++[[
++m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
++[[
++int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
++]])
++]])
++
++m4_ifdef( [[M4_YY_REENTRANT]],
++[[
++m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
++[[
++void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
++]])
++]])
++
+ %if-bison-bridge
+ m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
+ [[
+
+Diff finished.  Tue Jul 13 17:27:50 2010
+--- flex-2.5.35/skel.c~	2010-07-14 13:15:42.000000000 +0200
++++ flex-2.5.35/skel.c	2010-07-14 13:16:05.000000000 +0200
+@@ -1027,6 +1027,22 @@
+   "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
+   "]])",
+   "",
++  "m4_ifdef( [[M4_YY_REENTRANT]],",
++  "[[",
++  "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
++  "[[",
++  "int yyget_column  M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
++  "]])",
++  "]])",
++  "",
++  "m4_ifdef( [[M4_YY_REENTRANT]],",
++  "[[",
++  "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
++  "[[",
++  "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
++  "]])",
++  "]])",
++  "",
+   "%if-bison-bridge",
+   "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
+   "[[",
diff --git a/flex.spec b/flex.spec
index 46b7fcc..8c05a1b 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -9,6 +9,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0: flex-2.5.35-sign.patch
 Patch1: flex-2.5.35-hardening.patch
 Patch2: flex-2.5.35-gcc44.patch
+Patch3: flex-2.5.35-missing-prototypes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4
@@ -54,6 +55,7 @@ instead of implementing their own.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -107,6 +109,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 14 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-11
+- Forgot that the changes in flex.skl won't propagate to skel.c
+- Resolves: #612465
+
+* Tue Jul 13 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-10
+- Declare yyget_column and yyset_column in reentrant mode.
+- Resolves: #612465
+
 * Wed Jan 20 2010 Petr Machata <pmachata@redhat.com> - 2.5.35-9
 - Move libraries into a sub-package of their own.