diff --git a/srcpkgs/libpeas/libpeas-devel.rshlibs b/srcpkgs/libpeas/libpeas-devel.rshlibs
deleted file mode 100644
index cfe77d0ac21..00000000000
--- a/srcpkgs/libpeas/libpeas-devel.rshlibs
+++ /dev/null
@@ -1,18 +0,0 @@
-libgirepository-1.0.so.1
-libgtk-3.so.0
-libgdk-3.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangocairo-1.0.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
-libcairo.so.2
-libpango-1.0.so.0
-libgobject-2.0.so.0
-libgmodule-2.0.so.0
-librt.so.1
-libglib-2.0.so.0
-libpthread.so.0
-libc.so.6
-libpeas-1.0.so.0
-libpeas-gtk-1.0.so.0
diff --git a/srcpkgs/libpeas/libpeas-devel.template b/srcpkgs/libpeas/libpeas-devel.template
index 2b0048b5c63..1bc89fb2142 100644
--- a/srcpkgs/libpeas/libpeas-devel.template
+++ b/srcpkgs/libpeas/libpeas-devel.template
@@ -1,16 +1,17 @@
 # Template file for 'libpeas-devel'.
 #
-depends="glib-devel gtk+3-devel>=3.6.0_2 gobject-introspection ${sourcepkg}>=${version}"
+depends="glib-devel gtk+3-devel>=3.6.0_2 libgirepository-devel
+ ${sourcepkg}-${version}_${revision}"
+noarch=yes
+
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-pycompile_dirs="usr/lib/peas-demo/plugins/pythonhello"
-
 do_install() {
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/{peas-demo,pkgconfig} ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${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
 }
diff --git a/srcpkgs/libpeas/libpeas.rshlibs b/srcpkgs/libpeas/libpeas.rshlibs
index 9920efb3b53..3cf51b27c8b 100644
--- a/srcpkgs/libpeas/libpeas.rshlibs
+++ b/srcpkgs/libpeas/libpeas.rshlibs
@@ -1,28 +1,15 @@
+libgmodule-2.0.so.0
+libgio-2.0.so.0
 libgirepository-1.0.so.1
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
 libgjs.so.0
 libmozjs185.so.1.0
-libplds4.so
-libplc4.so
-libnspr4.so
-libdl.so.2
-libutil.so.1
-libm.so.6
 libpython2.7.so.1.0
 libseed-gtk3.so.0
 libjavascriptcoregtk-3.0.so.0
 libgtk-3.so.0
 libgdk-3.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
-libcairo-gobject.so.2
-libcairo.so.2
-libpango-1.0.so.0
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index a71e43756a6..5a595a0236f 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,12 +1,13 @@
 # Template file for 'libpeas'
 pkgname=libpeas
 version=1.6.0
-revision=1
+revision=2
+subpackages="$pkgname-devel"
 build_style=gnu-configure
-configure_args="--enable-vala"
+configure_args="--without-demo --disable-demo"
 depends="pygobject hicolor-icon-theme"
 makedepends="pkg-config intltool vala-devel libgirepository-devel
-gtk+3-devel>=3.6.0_2 python-devel pygobject-devel gjs-devel libseed-devel"
+ gtk+3-devel>=3.6.0_5 python-devel pygobject-devel gjs-devel libseed-devel"
 short_desc="Gobject-based plugins engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNOME_SITE}/$pkgname/1.6/$pkgname-$version.tar.xz"
@@ -20,5 +21,7 @@ long_desc="
  of features mirroring the desiderata of most of the applications providing an
  extension framework."
 
-subpackages="$pkgname-devel"
-
+post_install() {
+	# Remove demo.
+	rm -rf ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/peas-demo
+}