Index: head/devel/py-protobuf/Makefile
===================================================================
--- head/devel/py-protobuf/Makefile	(revision 385547)
+++ head/devel/py-protobuf/Makefile	(revision 385548)
@@ -1,30 +1,33 @@
 # Created by: vanilla@
 # $FreeBSD$
 
 PORTNAME=	protobuf
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	devel python
-MASTER_SITES=	https://protobuf.googlecode.com/svn/rc/ \
-		LOCAL/sunpoet
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google protobuf Python Client Library
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils \
 		protoc:${PORTSDIR}/devel/protobuf
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils
 
 USE_PYTHON=	autoplist distutils
 USES=		python tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/python
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	google
+GH_PROJECT=	protobuf
+GH_TAGNAME=	v${PORTVERSION}
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/google/protobuf/compiler/
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/devel/py-protobuf/distinfo
===================================================================
--- head/devel/py-protobuf/distinfo	(revision 385547)
+++ head/devel/py-protobuf/distinfo	(revision 385548)
@@ -1,2 +1,2 @@
-SHA256 (protobuf-2.6.0.tar.bz2) = 0a2f8533b2e0587a2b4efce0c4c8aea21bbfae1c41c466634d958dedf580f6aa
-SIZE (protobuf-2.6.0.tar.bz2) = 2021255
+SHA256 (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1
+SIZE (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 1349051
Index: head/devel/py-protobuf/pkg-descr
===================================================================
--- head/devel/py-protobuf/pkg-descr	(revision 385547)
+++ head/devel/py-protobuf/pkg-descr	(revision 385548)
@@ -1,5 +1,5 @@
 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.
 
-WWW: https://code.google.com/p/protobuf/
+WWW: https://github.com/google/protobuf