diff --git a/srcpkgs/gtk+-demo b/srcpkgs/gtk+-demo
new file mode 120000
index 00000000000..50dbbf5fe75
--- /dev/null
+++ b/srcpkgs/gtk+-demo
@@ -0,0 +1 @@
+gtk+
\ No newline at end of file
diff --git a/srcpkgs/gtk+/gtk+-demo.template b/srcpkgs/gtk+/gtk+-demo.template
new file mode 100644
index 00000000000..680dd35895e
--- /dev/null
+++ b/srcpkgs/gtk+/gtk+-demo.template
@@ -0,0 +1,20 @@
+# Template file for 'gtk+-demo'.
+#
+short_desc="${sourcepkg} - demonstration application"
+long_desc="${long_desc}
+
+ This package contains the example files and a demonstration program
+ for GTK+3."
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+
+
+do_install()
+{
+	vmove usr/bin/gtk-demo usr/bin
+	vmove usr/share/gtk-2.0 usr/share
+}
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index e754b9b8aad..647949d2d42 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -5,12 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run gdk-pixbuf
-Add_dependency run pkg-config
+revision=1
+
 Add_dependency run libXext-devel
 Add_dependency run libXrender-devel
 Add_dependency run libXinerama-devel
@@ -30,31 +26,13 @@ Add_dependency run glib-devel		">=2.28.0"
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
 Add_dependency run gtk+
-Add_dependency run python
 
 do_install()
 {
-	local lver="2.10.0"
-	local libdirs="immodules printbackends engines"
-
-	for dir in ${libdirs}; do
-		mkdir -p ${DESTDIR}/usr/lib/gtk-2.0/${lver}/${dir}
-	done
-	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-	mkdir -p ${DESTDIR}/usr/lib/gtk-2.0/modules
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	for bin in gtk-demo; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${bin} ${DESTDIR}/usr/bin
-		[ ! -f ${SRCPKGDESTDIR}/usr/share/man/man1/${bin}.1 ] && \
-			continue
-		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${bin}.1 \
-			${DESTDIR}/usr/share/man/man1
-	done
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/include ${DESTDIR}/usr/lib/gtk-2.0
-	mv ${SRCPKGDESTDIR}/usr/share/{gir-*,gtk-doc} ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-2.0 ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/lib/gtk-2.0/include usr/lib/gtk-2.0
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/aclocal usr/share
 }
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index cadac6352d2..ab0ae084d27 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -22,7 +22,7 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
-subpackages="gtk+-devel"
+subpackages="gtk+-devel gtk+-demo"
 
 Add_dependency run glibc
 Add_dependency run libXext
@@ -46,18 +46,18 @@ Add_dependency run fontconfig
 Add_dependency run shared-mime-info
 
 Add_dependency build pkg-config
-Add_dependency build perl
-Add_dependency build glib-devel
+Add_dependency build perl ">=0"
 Add_dependency build gobject-introspection
+Add_dependency build glib-devel
 Add_dependency build libXext-devel
 Add_dependency build libXrender-devel
 Add_dependency build libXinerama-devel
 Add_dependency build libXi-devel
 Add_dependency build libXrandr-devel
 Add_dependency build libXcursor-devel
-Add_dependency build pango-devel		">=1.28.0"
 Add_dependency build libXcomposite-devel
 Add_dependency build libXdamage-devel
+Add_dependency build pango-devel		">=1.28.0"
 Add_dependency build atk-devel			">=1.32.0"
 Add_dependency build cairo-devel
 Add_dependency build gdk-pixbuf-devel