diff --git a/common/shlibs b/common/shlibs
index 72f9a7cb911..3139369b802 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -881,9 +881,9 @@ liblilv-0.so.0 liblilv-0.14.4_1
 libsuil-0.so.0 suil-0.6.4_1
 libportaudio.so.2 portaudio-19.20110326_1
 libportaudiocpp.so.0 portaudiocpp-19.20110326_1
-libprotoc.so.7 protobuf-2.4.1_1
-libprotobuf.so.7 protobuf-2.4.1_1
-libprotobuf-lite.so.7 protobuf-lite-2.4.1_1
+libprotoc.so.8 protobuf-2.5.0_1
+libprotobuf.so.8 protobuf-2.5.0_1
+libprotobuf-lite.so.8 protobuf-lite-2.5.0_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libIce.so.34 libIce-3.4.2_1_1
 libIceUtil.so.34 libIce-3.4.2_1_1
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 9301f5d8f24..dfc5b14af90 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,23 +1,24 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=2.4.1
-revision=3
+version=2.5.0
+revision=1
 build_style=gnu-configure
-homepage="http://code.google.com/p/${pkgname}/"
-license="BSD"
-makedepends="libstdc++-devel zlib-devel pkg-config"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
 short_desc="Google's data interchange format"
 maintainer="davehome <davehome@redthumb.info.tm>"
 distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.bz2"
-checksum=cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
+homepage="http://code.google.com/p/${pkgname}/"
+license="BSD"
+checksum=13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
 long_desc="
  Protocol Buffers are a way of encoding structured data in an efficient yet
  extensible format. Google uses Protocol Buffers for almost all of its
  internal RPC protocols and file formats."
 
 protobuf-devel_package() {
-	depends="protobuf>=${version} protobuf-lite>=${version} zlib-devel"
-	short_desc="${short_desc} - development files"
+	depends="zlib-devel protobuf>=${version} protobuf-lite>=${version}"
+	short_desc="Google's data interchange format  - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -26,7 +27,7 @@ protobuf-devel_package() {
 }
 
 protobuf-lite_package() {
-	short_desc="${short_desc} - Lite version"
+	short_desc="Google's data interchange format - Lite version"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf-lite.so*"
 	}
@@ -34,6 +35,6 @@ protobuf-lite_package() {
 
 protobuf_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }