diff --git a/srcpkgs/gtk+3-demo b/srcpkgs/gtk+3-demo
new file mode 120000
index 00000000000..6dc54ba3851
--- /dev/null
+++ b/srcpkgs/gtk+3-demo
@@ -0,0 +1 @@
+gtk+3
\ No newline at end of file
diff --git a/srcpkgs/gtk+3/gtk+3-demo.template b/srcpkgs/gtk+3/gtk+3-demo.template
new file mode 100644
index 00000000000..71d7312d7e0
--- /dev/null
+++ b/srcpkgs/gtk+3/gtk+3-demo.template
@@ -0,0 +1,20 @@
+# Template file for 'gtk+3-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+3
+
+do_install()
+{
+	vmove usr/bin/gtk3-demo usr/bin
+	vmove usr/share/gtk-3.0 usr/share
+}
diff --git a/srcpkgs/gtk+3/gtk+3-devel.template b/srcpkgs/gtk+3/gtk+3-devel.template
index 9302d2bca9d..533f1c5d20b 100644
--- a/srcpkgs/gtk+3/gtk+3-devel.template
+++ b/srcpkgs/gtk+3/gtk+3-devel.template
@@ -1,15 +1,10 @@
-# Template file for 'gtk+-devel'.
+# Template file for 'gtk+3-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 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 libXext-devel
 Add_dependency run libXrender-devel
 Add_dependency run libXinerama-devel
@@ -31,26 +26,9 @@ Add_dependency run gtk+3
 
 do_install()
 {
-	local lver="3.0.0"
-	local libdirs="immodules printbackends engines"
-
-	for dir in ${libdirs}; do
-		mkdir -p ${DESTDIR}/usr/lib/gtk-3.0/${lver}/${dir}
-	done
-	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-	mkdir -p ${DESTDIR}/usr/lib/gtk-3.0/modules
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	for bin in gtk3-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/share/{gir-*,gtk-doc} ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-3.0 ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	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+3/template b/srcpkgs/gtk+3/template
index d4c594fdaf3..c15149c577f 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,6 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
-version=3.2.0
-revision=2
+version=3.2.1
 wrksrc="gtk+-${version}"
 distfiles="${GNOME_SITE}/gtk+/3.2/gtk+-$version.tar.xz"
 build_style=gnu_configure
@@ -11,7 +10,7 @@ short_desc="The GTK+ toolkit (v3)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
-checksum=bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c
+checksum=f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
 long_desc="
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -25,7 +24,7 @@ long_desc="
 
 triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
-subpackages="gtk+3-devel"
+subpackages="gtk+3-devel gtk+3-demo"
 
 Add_dependency run glibc
 Add_dependency run glib