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 f855411..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile for source rpm: flex
-# $Id$
-NAME := flex
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common
diff --git a/flex-2.5.33-includedir.patch b/flex-2.5.33-includedir.patch
new file mode 100644
index 0000000..3135be6
--- /dev/null
+++ b/flex-2.5.33-includedir.patch
@@ -0,0 +1,12 @@
+diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in
+--- flex-2.5.33/Makefile.in	2007-05-30 10:57:18.000000000 +0200
++++ flex-2.5.33-pm/Makefile.in	2007-05-30 10:57:11.000000000 +0200
+@@ -291,7 +291,7 @@ SUBDIRS = \
+ 
+ 
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+ AM_CFLAGS = -fPIC
+ 
+ # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
diff --git a/flex-2.5.33-yy.patch b/flex-2.5.33-yy.patch
index e229c0e..c6bc5fe 100644
--- a/flex-2.5.33-yy.patch
+++ b/flex-2.5.33-yy.patch
@@ -1,12 +1,13 @@
 diff -urp flex-2.5.33/flex.skl flex-2.5.33-pm/flex.skl
 --- flex-2.5.33/flex.skl	2006-02-16 23:20:43.000000000 +0100
 +++ flex-2.5.33-pm/flex.skl	2007-03-30 14:04:42.000000000 +0200
-@@ -54,6 +54,32 @@ m4_changequote([[, ]])
+@@ -54,6 +54,34 @@ m4_changequote([[, ]])
  %#   the generated scanner as a C-style comment. This is to aid those who
  %#   edit the skeleton.
  %#
 +
 +%not-for-header
++%if-c-only
 +%if-not-reentrant
 +m4_ifelse(M4_YY_PREFIX,yy,,
 +#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]
@@ -29,6 +30,7 @@ diff -urp flex-2.5.33/flex.skl flex-2.5.33-pm/flex.skl
 +#define yyfree M4_YY_PREFIX[[free]]
 +)
 +%endif
++%endif
 +%ok-for-header
 +
  #define FLEX_SCANNER
@@ -37,12 +39,13 @@ diff -urp flex-2.5.33/flex.skl flex-2.5.33-pm/flex.skl
 diff -urp flex-2.5.33/skel.c flex-2.5.33-pm/skel.c
 --- flex-2.5.33/skel.c	2006-02-21 03:45:41.000000000 +0100
 +++ flex-2.5.33-pm/skel.c	2007-03-30 14:04:43.000000000 +0200
-@@ -59,6 +59,32 @@ const char *skel[] = {
+@@ -59,6 +59,34 @@ const char *skel[] = {
    "%#   the generated scanner as a C-style comment. This is to aid those who",
    "%#   edit the skeleton.",
    "%#",
 +  "",
 +  "%not-for-header",
++  "%if-c-only",
 +  "%if-not-reentrant",
 +  "m4_ifelse(M4_YY_PREFIX,yy,,",
 +  "#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]",
@@ -65,6 +68,7 @@ diff -urp flex-2.5.33/skel.c flex-2.5.33-pm/skel.c
 +  "#define yyfree M4_YY_PREFIX[[free]]",
 +  ")",
 +  "%endif",
++  "%endif",
 +  "%ok-for-header",
 +  "",
    "#define FLEX_SCANNER",
diff --git a/flex.spec b/flex.spec
index 3d4e932..bff8ce7 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.33
-Release: 7%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -9,9 +9,10 @@ Source: flex-%{version}.tar.bz2
 Patch0: flex-2.5.33-pic.patch
 Patch1: flex-2.5.33-yy.patch
 Patch2: flex-2.5.33-opts.patch
+Patch3: flex-2.5.33-includedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
-BuildRequires: gettext info bison m4
+BuildRequires: gettext bison m4
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -34,10 +35,11 @@ application development.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-dependency-tracking
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +82,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_infodir}/flex.info*
 
 %changelog
+* Fri Jun 22 2007 Petr Machata <pmachata@redhat.com> - 2.5.33-9
+- Remove wrong use of @includedir@ in Makefile.in.
+- Spec cleanups.
+- Resolves: #225758
+
+* Fri Jun 22 2007 Petr Machata <pmachata@redhat.com> - 2.5.33-8
+- Don't emit yy-prefixed variables in C++ mode.  Thanks Srinivas Aji.
+- Resolves: #242742
+- Resolves: #244259
+
 * Fri May 11 2007 Petr Machata <pmachata@redhat.com> - 2.5.33-7
 - Allow joining short options into one commandline argument.
 - Resolves: #239695