Index: head/devel/py-protobuf/Makefile
===================================================================
--- head/devel/py-protobuf/Makefile	(revision 486531)
+++ head/devel/py-protobuf/Makefile	(revision 486532)
@@ -1,34 +1,26 @@
 # Created by: vanilla@
 # $FreeBSD$
 
 PORTNAME=	protobuf
-PORTVERSION=	3.5.2
-DISTVERSIONPREFIX=	v
+PORTVERSION=	3.6.1
 PORTEPOCH=	1
 CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google protobuf Python Client Library
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	protoc:devel/protobuf \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS=	protoc:devel/protobuf
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
 
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
 DO_MAKE_TEST=	${PYTHON_CMD} ${PYDISTUTILS_SETUP}
 NO_ARCH=	yes
 TEST_TARGET=	test
-USE_PYTHON=	autoplist concurrent distutils
-USES=		python
-WRKSRC_SUBDIR=	python
-
-GH_ACCOUNT=	google
-USE_GITHUB=	yes
-
-post-patch:
-	@${MKDIR} ${WRKSRC}/google/protobuf/compiler/
 
 .include <bsd.port.mk>
Index: head/devel/py-protobuf/distinfo
===================================================================
--- head/devel/py-protobuf/distinfo	(revision 486531)
+++ head/devel/py-protobuf/distinfo	(revision 486532)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523095625
-SHA256 (google-protobuf-v3.5.2_GH0.tar.gz) = 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
-SIZE (google-protobuf-v3.5.2_GH0.tar.gz) = 4584659
+TIMESTAMP = 1535569981
+SHA256 (protobuf-3.6.1.tar.gz) = 1489b376b0f364bcc6f89519718c057eb191d7ad6f1b395ffd93d1aa45587811
+SIZE (protobuf-3.6.1.tar.gz) = 240927
Index: head/devel/py-protobuf/pkg-descr
===================================================================
--- head/devel/py-protobuf/pkg-descr	(revision 486531)
+++ head/devel/py-protobuf/pkg-descr	(revision 486532)
@@ -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://github.com/google/protobuf
+WWW: https://github.com/protocolbuffers/protobuf