diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.bep
index 83cc88913..bed787eea 100644
--- a/sys-libs/mesa/mesa-7.8.2.bep
+++ b/sys-libs/mesa/mesa-7.8.2.bep
@@ -9,12 +9,12 @@ HOMEPAGE="http://www.freedesktop.org/"
 SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2"
 REVISION="1"
 STATUS_HAIKU="stable"
-DEPEND="scons"
-CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c"
+DEPEND=""
+CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
 MESSAGE="This port only builds with gcc2. Not for general use."
 BUILD {
 	cd Mesa-7.8.2
-	scons
+	make
 	cd ..
 	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-7.8.x.sh ./Mesa-7.8.2
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
diff --git a/sys-libs/mesa/mesapkg-7.8.x.sh b/sys-libs/mesa/mesapkg-7.8.x.sh
index 73c55d34a..78859ac8a 100755
--- a/sys-libs/mesa/mesapkg-7.8.x.sh
+++ b/sys-libs/mesa/mesapkg-7.8.x.sh
@@ -12,7 +12,7 @@ echo ""
 # These are the Mesa headers and libraries used by the opengl kit
 #   Headers are probed for dependencies, only specify ones referenced
 #   by the opengl kit.
-MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h glapi_priv.h context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h t_pipeline.h vbo.h extensions.h s_spantemp.h s_renderbuffer.h s_context.h formats.h cpuinfo.h"
+MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h t_pipeline.h vbo.h extensions.h s_spantemp.h s_context.h formats.h cpuinfo.h"
 
 DEBUG=0
 
@@ -101,7 +101,7 @@ fi
 
 echo "Creating Mesa OptionalPackage..."
 PLATFORM=$( uname -m )
-ZIP_FILENAME="../mesa-${MESA_VER}${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 ./include/GL/* ./lib.haiku/*
 
 echo "Great Success! $ZIP_FILENAME created."