diff --git a/srcpkgs/python-gobject/template b/srcpkgs/python-gobject/template
index 7a3cb032d9e..a3d0c6b2866 100644
--- a/srcpkgs/python-gobject/template
+++ b/srcpkgs/python-gobject/template
@@ -1,12 +1,11 @@
 # Template file for 'python-gobject'
 pkgname=python-gobject
 version=3.18.2
-revision=1
+revision=2
 wrksrc="pygobject-${version}"
 hostmakedepends="pkg-config gobject-introspection"
-makedepends="libglib-devel python-cairo-devel python3.4-cairo-devel"
-depends="gir-freedesktop python-cairo>=1.10.0_2"
-replaces="pygobject>=0"
+makedepends="libglib-devel python-cairo-devel python3-cairo-devel"
+depends="gir-freedesktop python-cairo"
 pycompile_module="gi pygtkcompat"
 short_desc="Python2 bindings for GObject"
 homepage="https://live.gnome.org/PyGObject"
@@ -17,56 +16,51 @@ checksum=2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f
 
 nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/8676/steps/shell_3/logs/stdio"
 
+pre_configure() {
+	mkdir -p gi-${py2_ver}
+	mv * gi-${py2_ver} || true
+	cp -a gi-${py2_ver} gi-${py3_ver}
+}
 do_configure() {
-	# python2
-	mkdir ${wrksrc}/build-python2
-	cd ${wrksrc}/build-python2
-	../configure ${configure_args} --with-python=/usr/bin/python
-
-	# python3.4
-	mkdir ${wrksrc}/build-python3.4
-	cd ${wrksrc}/build-python3.4
-	../configure ${configure_args} --with-python=/usr/bin/python3.4
+	for pyver in $py2_ver $py3_ver; do
+		cd ${wrksrc}/gi-${pyver}
+		./configure ${configure_args} --with-python=/usr/bin/python${pyver}
+	done
 }
 do_build() {
-	# python2
-	cd ${wrksrc}/build-python2
-	make ${makejobs}
-
-	# python3.4
-	cd ${wrksrc}/build-python3.4
-	make ${makejobs}
+	for pyver in $py2_ver $py3_ver; do
+		cd ${wrksrc}/gi-${pyver}
+		make ${makejobs}
+	done
 }
 do_install() {
-	# python2
-	cd ${wrksrc}/build-python2
-	make DESTDIR=${DESTDIR} install
-
-	# python3.4
-	cd ${wrksrc}/build-python3.4
-	make DESTDIR=${DESTDIR} install
+	for pyver in $py2_ver $py3_ver; do
+		cd ${wrksrc}/gi-${pyver}
+		make DESTDIR=${DESTDIR} install
+	done
 }
 
-python3.4-gobject_package() {
-	depends="gir-freedesktop python3.4-cairo>=1.10.0_2"
-	replaces="py3gobject>=0"
-	short_desc="Python3.4 bindings for GObject"
+python3-gobject_package() {
+	replaces="python3.4-gobject>=0"
+	pycompile_module="gi pygtkcompat"
+	depends="gir-freedesktop python3-cairo"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmkdir usr/lib
-		mv ${DESTDIR}/usr/lib/python3.4 ${PKGDESTDIR}/usr/lib
+		vmove ${py3_sitelib}
 	}
 }
 python-gobject-devel_package() {
-	depends="libgirepository-devel
-		 python-cairo-devel>=1.10.0_2
-		 python3.4-cairo-devel>=1.10.0_2
+	depends="libgirepository-devel python-cairo-devel python3-cairo-devel
 		 python-gobject>=${version}_${revision}
-		 python3.4-gobject>=${version}_${revision}"
-	replaces="pygobject-devel>=0"
+		 python3-gobject>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		rm -rf ${DESTDIR}/python3.4
 	}
 }
+python3.4-gobject_package() {
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-gobject>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-gobject b/srcpkgs/python3-gobject
new file mode 120000
index 00000000000..4af4eca5908
--- /dev/null
+++ b/srcpkgs/python3-gobject
@@ -0,0 +1 @@
+python-gobject
\ No newline at end of file