diff --git a/sys-libs/mesa/mesapkg-9.0.1.sh b/sys-libs/mesa/mesapkg-9.0.1.sh
index b25c1e914..86c0c7524 100644
--- a/sys-libs/mesa/mesapkg-9.0.1.sh
+++ b/sys-libs/mesa/mesapkg-9.0.1.sh
@@ -14,6 +14,7 @@ echo "-=-=-=-=-=-=-=-=-=-=-=-=-="
 echo ""
 
 DEBUG=0
+MESA_VER="9.0.1"
 
 #######################################################################
 # END CONFIG DATA, Dragons below!
@@ -37,7 +38,7 @@ MESA_TOP="$1"
 GCC_VER=`gcc -v 2>&1 | tail -1 | awk '{print $3}' | cut -d. -f1`
 DATESTAMP=`date +"%Y-%m-%d"`
 
-echo "Bundling gcc$GCC_VER build of Mesa 9.0..."
+echo "Bundling gcc$GCC_VER build of Mesa $MESA_VER..."
 
 cd $MESA_TOP
 
@@ -68,7 +69,7 @@ fi
 
 echo "Creating Mesa OptionalPackage..."
 PLATFORM=$( uname -m )
-ZIP_FILENAME="/boot/home/mesa-9.0.1${MESADBG}-x86-gcc${GCC_VER}-${DATESTAMP}.zip"
+ZIP_FILENAME="/boot/home/mesa-${MESA_VER}${MESADBG}-x86-gcc${GCC_VER}-${DATESTAMP}.zip"
 zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./lib.haiku/*
 
 echo "Great Success! $ZIP_FILENAME created."
diff --git a/sys-libs/mesa/patches/mesa-9.0.1.patch b/sys-libs/mesa/patches/mesa-9.0.1.patch
index a8393e539..457c1ce1b 100644
--- a/sys-libs/mesa/patches/mesa-9.0.1.patch
+++ b/sys-libs/mesa/patches/mesa-9.0.1.patch
@@ -1,3 +1,16 @@
+diff -Naur Mesa-9.0.1/scons/gallium.py Mesa-9.0.1-haiku/scons/gallium.py
+--- Mesa-9.0.1/scons/gallium.py	2012-11-09 12:16:31.041680896 -0600
++++ Mesa-9.0.1-haiku/scons/gallium.py	2012-12-19 16:03:56.564658176 -0600
+@@ -361,8 +361,7 @@
+                 ccflags += [
+                     '-mstackrealign', # ensure stack is aligned
+                     '-march=i586', # Haiku target is Pentium
+-                    '-mtune=i686', # use i686 where we can
+-                    '-mmmx' # use mmx math where we can
++                    '-mtune=i686'  # use i686 where we can
+                 ]
+         if env['machine'] == 'x86_64':
+             ccflags += ['-m64']
 diff -Naur Mesa-9.0.1/scons/llvm.py Mesa-9.0.1-haiku/scons/llvm.py
 --- Mesa-9.0.1/scons/llvm.py	2012-08-31 18:33:41.041680896 -0500
 +++ Mesa-9.0.1-haiku/scons/llvm.py	2012-12-18 23:05:50.677642240 -0600
@@ -27,35 +40,13 @@ diff -Naur Mesa-9.0.1/src/gallium/auxiliary/Makefile Mesa-9.0.1-haiku/src/galliu
  
 diff -Naur Mesa-9.0.1/src/mesa/SConscript Mesa-9.0.1-haiku/src/mesa/SConscript
 --- Mesa-9.0.1/src/mesa/SConscript	2012-11-09 12:16:31.015728640 -0600
-+++ Mesa-9.0.1-haiku/src/mesa/SConscript	2012-12-19 11:37:28.289144832 -0600
-@@ -331,6 +331,14 @@
-     statetracker_sources
- )
- 
-+mesa_gallium_sources = (
-+    main_sources +
-+    math_sources +
-+    vbo_sources +
-+    program_sources,
-+    'x86/common_x86.c'
-+)
-+
- GLAPI = '#src/mapi/glapi/'
- 
- if env['gles']:
-@@ -495,8 +503,15 @@
-     source = mesa_sources,
- )
- 
-+mesagallium = env.ConvenienceLibrary(
-+    target = 'mesagallium',
-+    source = mesa_gallium_sources,
-+)
-+
- env.Alias('mesa', mesa)
-+env.Alias('mesagallium', mesagallium)
- 
- Export('mesa')
-+Export('mesagallium')
- 
- SConscript('drivers/SConscript')
++++ Mesa-9.0.1-haiku/src/mesa/SConscript	2012-12-19 16:32:37.285736960 -0600
+@@ -371,7 +371,7 @@
+ #
+ # Assembly sources
+ #
+-if env['gcc'] and env['platform'] not in ('darwin', 'windows'):
++if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'):
+     if env['machine'] == 'x86':
+         env.Append(CPPDEFINES = [
+             'USE_X86_ASM',