diff --git a/flex-2.5.33-prototypes.patch b/flex-2.5.33-prototypes.patch
new file mode 100644
index 0000000..17c7021
--- /dev/null
+++ b/flex-2.5.33-prototypes.patch
@@ -0,0 +1,19 @@
+--- flex.skl	2008/02/09 15:49:48	2.211
++++ flex.skl	2008/02/09 18:54:56	2.212
+@@ -889,6 +889,8 @@
+ 
+ %endif
+ 
++%endif End reentrant structures and macros.
++
+ /* Accessor methods to globals.
+    These are made visible to non-reentrant scanners for convenience. */
+ 
+@@ -978,7 +980,6 @@
+     ]])
+ ]])
+ %endif
+-%endif End reentrant structures and macros.
+ 
+ /* Macros after this point can all be overridden by user definitions in
+  * section 1.
diff --git a/flex.spec b/flex.spec
index 4e3bd72..ebd26af 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: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -11,6 +11,7 @@ Patch2: flex-2.5.33-opts.patch
 Patch3: flex-2.5.33-includedir.patch
 Patch4: flex-2.5.33-test-linedir-r.patch
 Patch5: flex-2.5.33-signedwarn.patch
+Patch6: flex-2.5.33-prototypes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4
@@ -38,6 +39,7 @@ application development.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -84,6 +86,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Feb 11 2008 Petr Machata <pmachata@redhat.com> - 2.5.33-17
+- Generate prototypes for accessor functions.  Upstream patch.
+- Related: #432203
+
 * Mon Feb  4 2008 Petr Machata <pmachata@redhat.com> - 2.5.33-16
 - Fix comparison between signed and unsigned in generated scanner.
   Patch by Roland McGrath.