diff --git a/supertuxkart.changes b/supertuxkart.changes
index 32216bf..430bce7 100644
--- a/supertuxkart.changes
+++ b/supertuxkart.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jan  5 21:48:02 UTC 2014 - dimstar@opensuse.org
+
+- Use Mesa provided glext.h and glxext.h When building against
+  Mesa 10.0. The needed fixes (and more) are part of Mesa by now.
+
 -------------------------------------------------------------------
 Tue Nov 26 18:14:30 UTC 2013 - dimstar@opensuse.org
 
diff --git a/supertuxkart.spec b/supertuxkart.spec
index 0ab6dc9..5574757 100644
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package supertuxkart
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -68,6 +68,10 @@ Data files for SuperTuxKart a Free 3d kart racing game.
 
 %prep
 %setup -q -n SuperTuxKart-%{version}
+# If we're building against Mesa 10.0 (gl), then we want to use system glext.h and glxext.h
+if pkg-config --atleast-version 10.0 gl; then  
+  cp /usr/include/GL/{glext,glxext}.h lib/irrlicht/source/Irrlicht/
+fi
 
 %build
 # We need an internal version of Irrlicht...