diff --git a/common/shlibs b/common/shlibs
index 97d0b08d4f..59acfd1b26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1170,3 +1170,4 @@ libconfig++.so.9 libconfig++-1.4.8_1
 libconfig.so.9 libconfig-1.4.8_1
 libopusfile.so.0 opusfile-0.2_1
 libgtkaml.so.0 libgtkaml-0.5.94_1
+libgtk-vnc-1.0.so.0 gtk2-vnc-0.4.4_2
diff --git a/srcpkgs/gtk-vnc/gtk-vnc-devel.template b/srcpkgs/gtk-vnc/gtk-vnc-devel.template
index f9af3f65ef..b98507b199 100644
--- a/srcpkgs/gtk-vnc/gtk-vnc-devel.template
+++ b/srcpkgs/gtk-vnc/gtk-vnc-devel.template
@@ -1,14 +1,10 @@
 # Template file for 'gtk-vnc-devel'.
 #
-depends="glib-devel gtk+3-devel gtk-vnc"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
+noarch=yes
+depends="glib-devel gtk+3-devel gtk-vnc>=${version}"
+short_desc="${short_desc} - development files"
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/gir-1.0 usr/share
diff --git a/srcpkgs/gtk-vnc/gtk2-vnc-devel.template b/srcpkgs/gtk-vnc/gtk2-vnc-devel.template
new file mode 100644
index 0000000000..b0d7486693
--- /dev/null
+++ b/srcpkgs/gtk-vnc/gtk2-vnc-devel.template
@@ -0,0 +1,12 @@
+# Template file for 'gtk2-vnc-devel'.
+#
+noarch=yes
+depends="gtk+-devel gtk-vnc-devel>=${version}"
+short_desc="${short_desc} - GTK+2 development files"
+
+do_install() {
+	vmove usr/include/gtk-vnc-1.0 usr/include
+	#vmove usr/share/vala/vapi/gtk-vnc-1.0.vapi usr/share/vala/vapi
+	vmove usr/share/gir-1.0/GtkVnc-1.0.gir usr/share/gir-1.0
+	vmove usr/lib/pkgconfig/gtk-vnc-1.0.pc usr/lib/pkgconfig
+}
diff --git a/srcpkgs/gtk-vnc/gtk2-vnc-python.template b/srcpkgs/gtk-vnc/gtk2-vnc-python.template
new file mode 100644
index 0000000000..42d2e720dd
--- /dev/null
+++ b/srcpkgs/gtk-vnc/gtk2-vnc-python.template
@@ -0,0 +1,7 @@
+# Template file for 'gtk-vnc-python'.
+#
+short_desc="${short_desc} - python bindings"
+
+do_install() {
+	vmove usr/lib/python2.7 usr/lib
+}
diff --git a/srcpkgs/gtk-vnc/gtk2-vnc.template b/srcpkgs/gtk-vnc/gtk2-vnc.template
new file mode 100644
index 0000000000..1da8709dd3
--- /dev/null
+++ b/srcpkgs/gtk-vnc/gtk2-vnc.template
@@ -0,0 +1,8 @@
+# Template file for 'gtk2-vnc'.
+#
+short_desc="${short_desc} - GTK+2 port"
+
+do_install() {
+	vmove "usr/lib/libgtk-vnc-1.0.so*" usr/lib
+	vmove /usr/lib/girepository-1.0/GtkVnc-1.0.typelib usr/lib/girepository-1.0
+}
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 6ee75a08c3..e83807f729 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -1,23 +1,40 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
 version=0.4.4
-distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-configure_args="--disable-python --disable-static --with-gtk=3.0"
-makedepends="perl>=0 pkg-config intltool gobject-introspection gtk+3-devel
- gnutls-devel>=3.1.5 libsasl-devel vala-devel"
 revision=2
+subpackages="gtk2-vnc gtk2-vnc-devel gtk2-vnc-python gtk-vnc-devel"
+makedepends="perl>=0 pkg-config intltool gobject-introspection gtk+3-devel
+ gnutls-devel>=3.1.5 libsasl-devel vala-devel python-devel pygtk-devel"
 short_desc="VNC viewer widget for GTK"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
+distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
 checksum=c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7
-long_desc="
- gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines allowing
- it to be completely asynchronous while remaining single threaded. It provides
- a core C library, and bindings for Python (PyGTK).
 
- gtk-vnc supports a number of VNC extensions aimed at improving the user
- experience, particularly when interacting with virtual machines."
+post_extract() {
+	cp -a ${wrksrc} /tmp/gtk2-build
+	cp -a ${wrksrc} /tmp/gtk3-build
+	mv /tmp/gtk[23]-build ${wrksrc}
+}
 
-subpackages="$pkgname-devel"
+do_configure() {
+	cd ${wrksrc}/gtk2-build
+	./configure ${CONFIGURE_SHARED_ARGS} --with-python \
+		--disable-static --with-gtk=2.0
+
+	cd ${wrksrc}/gtk3-build
+	./configure ${CONFIGURE_SHARED_ARGS} --with-python \
+		--disable-static --with-gtk=3.0
+}
+
+do_build() {
+	cd ${wrksrc}/gtk2-build && make ${makejobs}
+	cd ${wrksrc}/gtk3-build && make ${makejobs}
+}
+
+do_install() {
+	cd ${wrksrc}/gtk2-build && make DESTDIR=${DESTDIR} install
+	cd ${wrksrc}/gtk3-build && make DESTDIR=${DESTDIR} install
+}
+	
diff --git a/srcpkgs/gtk2-vnc b/srcpkgs/gtk2-vnc
new file mode 120000
index 0000000000..25a6952fbc
--- /dev/null
+++ b/srcpkgs/gtk2-vnc
@@ -0,0 +1 @@
+gtk-vnc
\ No newline at end of file
diff --git a/srcpkgs/gtk2-vnc-devel b/srcpkgs/gtk2-vnc-devel
new file mode 120000
index 0000000000..25a6952fbc
--- /dev/null
+++ b/srcpkgs/gtk2-vnc-devel
@@ -0,0 +1 @@
+gtk-vnc
\ No newline at end of file
diff --git a/srcpkgs/gtk2-vnc-python b/srcpkgs/gtk2-vnc-python
new file mode 120000
index 0000000000..25a6952fbc
--- /dev/null
+++ b/srcpkgs/gtk2-vnc-python
@@ -0,0 +1 @@
+gtk-vnc
\ No newline at end of file