diff --git a/mesa-fix-yylex.patch b/mesa-fix-yylex.patch
new file mode 100644
index 0000000..f299640
--- /dev/null
+++ b/mesa-fix-yylex.patch
@@ -0,0 +1,47 @@
+From 4104ce76e435612d2561a3e3cc79f47199ec41ce Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 14 Sep 2012 10:05:53 +1000
+Subject: [PATCH 1/2] mesa: use a prefix for the program lex
+
+This avoids us making a global yylex symbol which will interfere will
+all sorts of apps.
+
+with libdricore which can't do symbol visibility currently we pollute
+the namespace with this.
+
+This is a candidate for 9.0 & stable branches.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+ src/mesa/Makefile.am             |    2 +-
+ src/mesa/program/program_lexer.l |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
+index 57325af..8e4530d 100644
+--- a/src/mesa/Makefile.am
++++ b/src/mesa/Makefile.am
+@@ -73,7 +73,7 @@ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
+ 
+ program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
+ 	$(MKDIR_P) program
+-	$(AM_V_GEN) $(YACC) -v -d --output=program/program_parse.tab.c $<
++	$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
+ 
+ program/lex.yy.c: program/program_lexer.l
+ 	$(MKDIR_P) program
+diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l
+index 0a50dab..0947bb0 100644
+--- a/src/mesa/program/program_lexer.l
++++ b/src/mesa/program/program_lexer.l
+@@ -165,6 +165,7 @@ szf    [HR]?
+ cc     C?
+ sat    (_SAT)?
+ 
++%option prefix="_mesa_program_"
+ %option bison-bridge bison-locations reentrant noyywrap
+ %%
+ 
+-- 
+1.7.10.2
+
diff --git a/mesa.spec b/mesa.spec
index fe12235..36a6d60 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -36,7 +36,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 8.1
-Release: 0.19%{?dist}
+Release: 0.20%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -56,6 +56,9 @@ Patch12: mesa-8.0.1-fix-16bpp.patch
 # Revert libkms usage so we don't need to revive it
 Patch13: mesa-no-libkms.patch
 
+# fix yylex collision
+Patch14: mesa-fix-yylex.patch
+
 # Courtesy of Mageia cauldron:
 # Fix undefined syms: http://svnweb.mageia.org/packages/cauldron/mesa/current/SOURCES/0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch?revision=278531&view=co
 Patch101: mesa-undefined-symbols.patch
@@ -284,6 +287,7 @@ Mesa shared glapi
 %patch11 -p1 -b .nouveau
 %patch12 -p1 -b .16bpp
 %patch13 -p1 -b .no-libkms
+%patch14 -p1 -b .yylex
 %patch101 -p1 -b .syms
 
 %build
@@ -579,6 +583,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 14 2012 Dave Airlie <airlied@redhat.com> 8.1-0.20
+- fix yylex collision reported on irc by hughsie
+
 * Mon Aug 27 2012 Adam Jackson <ajax@redhat.com> 8.1-0.19
 - Today's git snap
 - Revert dependency on libkms