diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe
index 631423dba..bfde9e98c 100644
--- a/sys-libs/mesa/mesa-7.8.2.recipe
+++ b/sys-libs/mesa/mesa-7.8.2.recipe
@@ -1,3 +1,9 @@
+# NOTE: This recipe doesn't generate packages for general use:
+# * mesa_devel: Is a service package for the Haiku build system. It contains the
+#   Mesa libraries and headers, which are built into the Haiku system package.
+# * mesa: Is an empty package which we keep as a dependency for the Haiku system
+#   package, mainly to keep the copyright info.
+
 SUMMARY="Multi-platform GL implementation"
 DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.
 
@@ -9,23 +15,17 @@ COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2"
 CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 !x86"
 
 PROVIDES="
 	mesa = $portVersion
-    lib:libglapi = $portVersion
-    lib:libglslcl = $portVersion
-    lib:libglslpp = $portVersion
-    lib:libglu = $portVersion
-    lib:libmesa = $portVersion
-    lib:libmesagallium = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
@@ -52,4 +52,29 @@ INSTALL()
 
 	mkdir -p $developLibDir
 	cp lib/libglu.a src/mesa/*.a src/glsl/*/*.a $developLibDir
+
+	mesaPrivateHeaders=$includeDir/mesa_private
+	for header in $(find src -name '*\.h' | sed "s,^src/,,"); do
+		mkdir -p $mesaPrivateHeaders/$(dirname $header)
+		cp src/$header $mesaPrivateHeaders/$header
+	done
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mesa_devel = $portVersion
+	devel:libglapi = $portVersion
+	devel:libglslcl = $portVersion
+	devel:libglslpp = $portVersion
+	devel:libglu = $portVersion
+	devel:libmesa = $portVersion
+	devel:libmesagallium = $portVersion
+	"
+REQUIRES_devel="
+	mesa == $portVersion base
+	"