diff --git a/common/shlibs b/common/shlibs
index 4641aaaf9cd..ad1802e6db4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -872,9 +872,9 @@ libopenal.so.1 libopenal-1.13_1
 libalut.so.0 freealut-1.1.0_1
 liblilv-0.so.0 liblilv-0.14.4_1
 libsuil-0.so.0 suil-0.6.4_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
+libprotoc.so.9 protobuf-2.6.1_1
+libprotobuf.so.9 protobuf-2.6.1_1
+libprotobuf-lite.so.9 protobuf-lite-2.6.1_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libGlacier2.so.35 libIce-3.5.0_1
 libIce.so.35 libIce-3.5.0_1
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index a977541ad19..eb0402cffa4 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,25 +1,25 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=2.5.0
-revision=4
+version=2.6.1
+revision=1
 build_style=gnu-configure
-hostmakedepends="libtool pkg-config"
+hostmakedepends="automake libtool pkg-config"
 makedepends="zlib-devel"
 short_desc="Google's data interchange format"
 maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.bz2"
-homepage="http://code.google.com/p/${pkgname}/"
+distfiles="https://github.com/google/protobuf/releases/download/${version}/protobuf-${version}.tar.bz2"
+homepage="https://developers.google.com/protocol-buffers/"
 license="BSD"
-checksum=13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
+checksum=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
 
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" protobuf>=2.6"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
 pre_configure() {
-	libtoolize -f
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 protobuf-devel_package() {
@@ -32,7 +32,6 @@ protobuf-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 protobuf-lite_package() {
 	short_desc="Google's data interchange format - Lite version"
 	pkg_install() {