diff --git a/common/shlibs b/common/shlibs
index 9e56214a074..6c0e9269df0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -361,8 +361,6 @@ libnssdbm3.so nss-3.12.4_1
 libnssckbi.so nss-3.12.4_1
 libnss3.so nss-3.12.4_1
 libcurl.so.4 libcurl-7.19_1
-libpyglib-gi-2.0-python.so.0 pygobject-3.10.0_2
-libpyglib-gi-2.0-python3.so.0 py3gobject-3.10.0_2
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
@@ -1547,9 +1545,9 @@ libwx_gtk2u_core-2.8.so.0 wxWidgets-2.8.12_3
 libogmrip-gtk.so.1 ogmrip-1.0.0_1
 libogmdvd.so.1 ogmrip-1.0.0_1
 libogmjob.so.1 ogmrip-1.0.0_1
-libogmrip-mplayer.so.1 ogmrip-1.0.0_1 
+libogmrip-mplayer.so.1 ogmrip-1.0.0_1
 libogmrip.so.1 ogmrip-1.0.0_1
-libogmrip-lavc.so.1 ogmrip-1.0.0_1 
+libogmrip-lavc.so.1 ogmrip-1.0.0_1
 libogmdvd-gtk.so.1 ogmrip-1.0.0_1
 libSDL2_image-2.0.so.0 SDL2_image-2.0.0_1
 liba2ps.so.1 liba2ps-4.14_1
@@ -1647,3 +1645,4 @@ libpython3.4m.so.1.0 python3.4-3.4.1_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libshiboken.cpython-34m.so.1.2 python3.4-shiboken-1.2.2_2
 libpyside.cpython-34m.so.1.2 python3.4-pyside-1.2.2_2
+libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
diff --git a/srcpkgs/pygobject2-devel b/srcpkgs/pygobject2-devel
deleted file mode 120000
index 83a150983be..00000000000
--- a/srcpkgs/pygobject2-devel
+++ /dev/null
@@ -1 +0,0 @@
-pygobject2
\ No newline at end of file
diff --git a/srcpkgs/python-gobject2-devel b/srcpkgs/python-gobject2-devel
new file mode 120000
index 00000000000..e996bbede67
--- /dev/null
+++ b/srcpkgs/python-gobject2-devel
@@ -0,0 +1 @@
+python-gobject2
\ No newline at end of file
diff --git a/srcpkgs/pygobject2/template b/srcpkgs/python-gobject2/template
similarity index 66%
rename from srcpkgs/pygobject2/template
rename to srcpkgs/python-gobject2/template
index 9451918f7b6..508972009d5 100644
--- a/srcpkgs/pygobject2/template
+++ b/srcpkgs/python-gobject2/template
@@ -1,21 +1,21 @@
-# Template file for 'pygobject2'
-pkgname=pygobject2
+# Template file for 'python-gobject2'
+pkgname=python-gobject2
 version=2.28.6
-revision=10
-wrksrc=${pkgname%2}-${version}
+revision=11
+wrksrc=pygobject-${version}
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-introspection"
 hostmakedepends="automake libtool pkg-config python-devel which glib-devel"
-makedepends="libffi-devel libglib-devel cairo-devel python-devel py2cairo-devel"
-depends="cairo python py2cairo"
+makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
+depends="cairo python python-cairo"
 pycompile_module="glib gobject gtk-2.0 pygtk"
-replaces="pygobject<3.0.0"
-short_desc="Python bindings for GObject (GLib 2.x)"
+replaces="pygobject<3.0.0 pygobject2>=0"
+short_desc="Python2 bindings for GObject (GLib 2.x)"
 homepage="http://www.pygtk.org/"
 license="LGPL-2.1"
 maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
+distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
 checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
 
 pre_configure() {
@@ -32,12 +32,13 @@ do_configure() {
 	./configure ${configure_args}
 }
 
-pygobject2-devel_package() {
+python-gobject2-devel_package() {
 	lib32disabled=yes
-	depends="libffi-devel libglib-devel py2cairo-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libffi-devel libglib-devel python-cairo-devel
+	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pycompile_module="usr/share/pygobject/2.0/codegen"
-	replaces="pygobject-devel<3.0.0"
+	replaces="pygobject-devel<3.0.0 pygobject2-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig