diff --git a/freeglut-glextconflict.patch b/freeglut-glextconflict.patch
new file mode 100644
index 0000000..d5c0ce8
--- /dev/null
+++ b/freeglut-glextconflict.patch
@@ -0,0 +1,10 @@
+--- freeglut-2.8.0/progs/demos/smooth_opengl3/smooth_opengl3.c.orig	2012-08-02 18:52:39.007793150 -0400
++++ freeglut-2.8.0/progs/demos/smooth_opengl3/smooth_opengl3.c	2012-08-02 18:52:41.387901801 -0400
+@@ -102,7 +102,6 @@
+ typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+ typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
+ typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
+-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
+ typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
+ typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
+ typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
diff --git a/freeglut.spec b/freeglut.spec
index c2faa7d..927a2c9 100644
--- a/freeglut.spec
+++ b/freeglut.spec
@@ -1,14 +1,14 @@
 Summary:        A freely licensed alternative to the GLUT library
 Name:           freeglut
 Version:        2.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 URL:            http://freeglut.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For the manpages
 Source1:        http://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz
 License:        MIT
 Group:          System Environment/Libraries
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  pkgconfig libGLU-devel libXext-devel libXxf86vm-devel
 BuildRequires:  libXi-devel libICE-devel
 # The virtual Provides below is present so that this freeglut package is a
@@ -22,6 +22,8 @@ Obsoletes:      glut < 3.7
 # Fix linking of the examples -- we don't package them, they just need to
 # compile and link
 Patch0: freeglut-2.8.0-fixld.patch
+# Fix for conflicting types found in GLext
+Patch1: freeglut-glextconflict.patch
 
 %description
 freeglut is a completely open source alternative to the OpenGL Utility Toolkit
@@ -53,6 +55,7 @@ license.
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .fixld
+%patch1 -p1 -b .fix-glext
 
 %build
 # --disable-warnings -> don't add -Werror to CFLAGS
@@ -61,7 +64,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
@@ -69,10 +71,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
 install -p -m 644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -91,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  3 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2.8.0-5
+- Add patch to fix FTBFS
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild