diff --git a/srcpkgs/python-protobuf/template b/srcpkgs/python-protobuf/template
index 0e888cf2302..683f0961cae 100644
--- a/srcpkgs/python-protobuf/template
+++ b/srcpkgs/python-protobuf/template
@@ -1,25 +1,32 @@
 # Template file for 'python-protobuf'
 pkgname=python-protobuf
 version=3.3.0
-revision=1
+revision=2
 noarch=yes
 wrksrc="protobuf-${version}"
-build_style=python2-module
-pycompile_module="protobuf"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python bindings for Google Protocol Buffers"
+build_style=python-module
+pycompile_module="google/protobuf"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-setuptools python-six"
+short_desc="Python2 bindings for Google Protocol Buffers"
 maintainer="Charles E. Lehner <cel@celehner.com>"
 homepage="https://developers.google.com/protocol-buffers/"
-license="BSD"
-distfiles="
-${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz
-https://raw.githubusercontent.com/google/protobuf/master/LICENSE"
-checksum="1cbcee2c45773f57cb6de7ee0eceb97f92b9b69c0178305509b162c0160c1f04
- af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262"
-skip_extraction=LICENSE
+license="3-clause-BSD"
+distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
+checksum=1cbcee2c45773f57cb6de7ee0eceb97f92b9b69c0178305509b162c0160c1f04
 
 post_install() {
-	vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE
-	chmod -R o+r $DESTDIR/usr/lib
+	sed -n 1,29p google/protobuf/__init__.py >LICENSE
+	vlicense LICENSE
+}
+
+python3-protobuf_package() {
+	noarch=yes
+	pycompile_module="google/protobuf"
+	depends="python3-setuptools python3-six"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
 }
diff --git a/srcpkgs/python3-protobuf b/srcpkgs/python3-protobuf
new file mode 120000
index 00000000000..bff725921c4
--- /dev/null
+++ b/srcpkgs/python3-protobuf
@@ -0,0 +1 @@
+python-protobuf
\ No newline at end of file