diff --git a/mesa-7.1-link-shared.patch b/mesa-7.1-link-shared.patch
index 920cb74..f205106 100644
--- a/mesa-7.1-link-shared.patch
+++ b/mesa-7.1-link-shared.patch
@@ -48,7 +48,7 @@ diff -up mesa-20080331/src/mesa/drivers/dri/Makefile.jx mesa-20080331/src/mesa/d
  	-mkdir $(TOP)/$(LIB_DIR)
  
 +libdricore.so:
-+	ld -shared -o libdricore.so --whole-archive ../../libmesa.a --no-whole-archive -lm -lpthread -lc
++	gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
 +
 +$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
 +	$(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) 
diff --git a/mesa.spec b/mesa.spec
index 0a36160..e6fbf4c 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.33%{?dist}
+Release: 0.34%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -421,6 +421,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Wed Jun 04 2008 Adam Jackson <ajax@redhat.com> 7.1-0.34
+- Link libdricore with gcc instead of ld, so we automagically pick up the
+  ld --build-id flags.
+
 * Wed May 28 2008 Dave Airlie <airlied@redhat.com> 7.1-0.33
 - Add initial r500 3D driver