diff --git a/glew-1.5.2-makefile.patch b/glew-1.5.2-makefile.patch
deleted file mode 100644
index 98cacde..0000000
--- a/glew-1.5.2-makefile.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
---- glew-1.5.5/config/Makefile.linux.make	2010-07-13 12:36:44.000000000 -0400
-+++ glew-1.5.5/config/Makefile.linux	2010-08-25 16:24:05.000000000 -0400
-@@ -7,14 +7,8 @@ endif
- PICFLAG = -fPIC
- LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
- M_ARCH ?= $(shell uname -m)
--ifeq (x86_64,${M_ARCH})
--LDFLAGS.EXTRA = -L/usr/X11R6/lib64
--LIBDIR = $(GLEW_DEST)/lib64
--else
--LDFLAGS.EXTRA = -L/usr/X11R6/lib
--LIBDIR = $(GLEW_DEST)/lib
--endif
--LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
-+LIBDIR = $(GLEW_DEST)$(libdir)
-+LDFLAGS.GL = -lGL
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- NAME = GLEW
-diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
---- glew-1.5.5/Makefile.make	2010-07-13 12:36:45.000000000 -0400
-+++ glew-1.5.5/Makefile	2010-08-25 16:25:27.000000000 -0400
-@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
- endif
- 
- GLEW_DEST ?= /usr
--BINDIR ?= $(GLEW_DEST)/bin
--LIBDIR ?= $(GLEW_DEST)/lib
--INCDIR ?= $(GLEW_DEST)/include/GL
-+BINDIR ?= $(GLEW_DEST)$(bindir)
-+LIBDIR ?= $(GLEW_DEST)$(libdir)
-+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
- SHARED_OBJ_EXT ?= o
- TARDIR = ../glew-$(GLEW_VERSION)
- TARBALL = ../glew-$(GLEW_VERSION).tar.gz
-@@ -55,7 +55,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
- 
- AR = ar
- INSTALL = install
--STRIP = strip
-+STRIP = true
- RM = rm -f
- LN = ln -sf
- ifeq ($(MAKECMDGOALS), debug)
-@@ -100,7 +100,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS
- 	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
- 
- bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LIB.SHARED)
--	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
-+	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) -lGLU
- 
- %.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
- 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
- else
- 	$(STRIP) -x lib/$(LIB.SHARED)
--	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
-+	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
- endif
- # development files
-@@ -148,7 +148,7 @@ else
- 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
- endif
- # utilities
--	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
-+	$(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
- 
- uninstall:
- 	$(RM) $(INCDIR)/wglew.h
diff --git a/glew-1.5.7-add-needed.patch b/glew-1.5.7-add-needed.patch
deleted file mode 100644
index 0279ce5..0000000
--- a/glew-1.5.7-add-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glew-1.5.7/config/Makefile.linux	2011-03-23 14:00:51.146177580 -0700
-+++ glew-1.5.7/config/Makefile.linux.new	2011-03-23 14:23:27.568295306 -0700
-@@ -8,7 +8,7 @@
- LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
- M_ARCH ?= $(shell uname -m)
- LIBDIR = $(GLEW_DEST)$(libdir)
--LDFLAGS.GL = -lGL
-+LDFLAGS.GL = -lGL -lX11 -lGLU
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- NAME = GLEW
diff --git a/glew-1.5.8-glewmx.patch b/glew-1.5.8-glewmx.patch
index eb4e72e..0e11757 100644
--- a/glew-1.5.8-glewmx.patch
+++ b/glew-1.5.8-glewmx.patch
@@ -51,7 +51,7 @@ index 2499b8d..ebba21a 100644
 -	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
 -
 -bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LIB.SHARED)
--	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) -lGLU
+-	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
 -
 -%.o: %.c
 -	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/glew-1.5.8-makefile.patch b/glew-1.5.8-makefile.patch
new file mode 100644
index 0000000..b23215a
--- /dev/null
+++ b/glew-1.5.8-makefile.patch
@@ -0,0 +1,63 @@
+diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
+--- glew-1.5.5/config/Makefile.linux.make	2010-07-13 12:36:44.000000000 -0400
++++ glew-1.5.5/config/Makefile.linux	2010-08-25 16:24:05.000000000 -0400
+@@ -7,14 +7,8 @@ endif
+ PICFLAG = -fPIC
+ LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
+ M_ARCH ?= $(shell uname -m)
+-ifeq (x86_64,${M_ARCH})
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib64
+-LIBDIR = $(GLEW_DEST)/lib64
+-else
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib
+-LIBDIR = $(GLEW_DEST)/lib
+-endif
+-LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
++LIBDIR = $(GLEW_DEST)$(libdir)
++LDFLAGS.GL = -lGL -lX11 -lGLU
+ LDFLAGS.STATIC = -Wl,-Bstatic
+ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+ NAME = GLEW
+diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
+--- glew-1.5.5/Makefile.make	2010-07-13 12:36:45.000000000 -0400
++++ glew-1.5.5/Makefile	2010-08-25 16:25:27.000000000 -0400
+@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
+ endif
+ 
+ GLEW_DEST ?= /usr
+-BINDIR ?= $(GLEW_DEST)/bin
+-LIBDIR ?= $(GLEW_DEST)/lib
+-INCDIR ?= $(GLEW_DEST)/include/GL
++BINDIR ?= $(GLEW_DEST)$(bindir)
++LIBDIR ?= $(GLEW_DEST)$(libdir)
++INCDIR ?= $(GLEW_DEST)$(includedir)/GL
+ SHARED_OBJ_EXT ?= o
+ TARDIR = ../glew-$(GLEW_VERSION)
+ TARBALL = ../glew-$(GLEW_VERSION).tar.gz
+@@ -55,7 +55,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
+ 
+ AR = ar
+ INSTALL = install
+-STRIP = strip
++STRIP = true
+ RM = rm -f
+ LN = ln -sf
+ ifeq ($(MAKECMDGOALS), debug)
+@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
+ 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
+ else
+ 	$(STRIP) -x lib/$(LIB.SHARED)
+-	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
++	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
+ 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
+ endif
+ # development files
+@@ -148,7 +148,7 @@ else
+ 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
+ endif
+ # utilities
+-	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
++	$(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
+ 
+ uninstall:
+ 	$(RM) $(INCDIR)/wglew.h
diff --git a/glew.spec b/glew.spec
index c917c9b..0322ba9 100644
--- a/glew.spec
+++ b/glew.spec
@@ -1,20 +1,19 @@
 Name:           glew
 Version:        1.5.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The OpenGL Extension Wrangler Library
 Group:          System Environment/Libraries
 License:        BSD and MIT
 URL:            http://glew.sourceforge.net
 
 Source0:	http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
-Patch0:         glew-1.5.2-makefile.patch
-Patch1:		glew-1.5.7-add-needed.patch
+Patch0:         glew-1.5.8-makefile.patch
 # From upstream: build MX-enabled library, with a different soname
 # http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew/glew;a=commitdiff;h=18455eb40fe2d71f5f78cce0bf44eb302c224016
 # (rediffed for our makefile changes)
-Patch2:		glew-1.5.8-glewmx.patch
+Patch1:		glew-1.5.8-glewmx.patch
 # Fixes the soname of libGLEWmx, sent upstream
-Patch3:		glew-1.5.8-soname.patch
+Patch2:		glew-1.5.8-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libGLU-devel
 
@@ -57,9 +56,8 @@ libGLEWmx
 %prep
 %setup -q
 %patch0 -p1 -b .make
-%patch1 -p1 -b .add
-%patch2 -p1 -b .glewmx
-%patch3 -p1 -b .soname
+%patch1 -p1 -b .glewmx
+%patch2 -p1 -b .soname
 
 sed -i -e 's/\r//g' config/config.guess
 
@@ -109,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Wed Mar 23 2011 Adam Williamson <awilliam@redhat.com> - 1.5.8-3
+- instead of taking flags out in makefile.patch and adding them back
+  in add-needed.patch, let's just not take them out...
+
 * Wed Mar 23 2011 Adam Jackson <ajax@redhat.com> 1.5.8-2
 - glew-1.5.8-glewmx.patch: Install libGLEWmx 0755 so autoprovs work
 - Split runtime libraries to their own packages