diff --git a/dev-libs/protobuf/protobuf-2.4.1.recipe b/dev-libs/protobuf/protobuf-2.4.1.recipe
index ef23ac899..f72d05f40 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.recipe
+++ b/dev-libs/protobuf/protobuf-2.4.1.recipe
@@ -1,31 +1,76 @@
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="http://code.google.com/p/protobuf/"
+SUMMARY="An efficient method of encoding structured data"
+DESCRIPTION="Protocol buffers are Google's language-neutral, platform-neutral, \
+extensible mechanism for serializing structured data – think XML, but smaller, \
+faster, and simpler. You define how you want your data to be structured once, \
+then you can use special generated source code to easily write and read your \
+structured data to and from a variety of data streams and using a variety of \
+languages – Java, C++, or Python."
+HOMEPAGE="https://developers.google.com/protocol-buffers/"
 SRC_URI="http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2"
-CHECKSUM_MD5="ed436802019c9e1f40cc750eaf78f318"
+CHECKSUM_SHA256="cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	protobuf$secondaryArchSuffix =$portVersion
+	cmd:protoc$secondaryArchSuffix
+	lib:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
+	lib:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
+	lib:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	lib:libgcc_s$secondaryArchSuffix
+"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+"
 
 BUILD()
 {
-	cd protobuf-2.4.1
 	libtoolize --force --copy --install
 	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd protobuf-2.4.1
 	make install
+	
+	prepareInstalledDevelLibs libprotobuf-lite libprotobuf libprotoc
+	fixPkgconfig
+	packageEntries devel $developDir
 }
 
 TEST()
 {
-	cd protobuf-2.4.1
 	make check
 }
 
 LICENSE="Apache v2"
 COPYRIGHT="2008 Google"
+
+PROVIDES_devel="
+	protobuf${secondaryArchSuffix}_devel = $portVersion
+	devel:libprotobuf_lite$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libprotobuf$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libprotoc$secondaryArchSuffix = 7.0.0 compat >= 7
+"
+
+REQUIRES_devel="
+	protobuf$secondaryArchSuffix == $portVersion base
+"