diff --git a/common/shlibs b/common/shlibs
index 3c48e5d30ca..cf81e51180c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -821,7 +821,7 @@ liblrdf.so.2 liblrdf-0.4.0
 libserd-0.so.0 libserd-0.5.0
 libsord-0.so.0 libsord-0.5.0
 libgiggle.so.0 libgiggle-0.6.1
-libgiggle-git.so.0 libgiggle
+libgiggle-git.so.0 libgiggle-0.6.1
 libwine.so.1 libwine-1.2.3
 libwine.so.1 libwine-unstable-1.2.3
 libwv-1.2.so.3 libwv-1.2.4
diff --git a/srcpkgs/giggle/giggle-devel.template b/srcpkgs/giggle/giggle-devel.template
index 6358305aff3..2a4dcbbed06 100644
--- a/srcpkgs/giggle/giggle-devel.template
+++ b/srcpkgs/giggle/giggle-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'giggle-devel'.
 #
-depends="libgiggle"
+noarch=yes
+depends="libgiggle>=$version"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
-        vmove usr/include usr
-        #vmove usr/lib/pkgconfig usr/lib
+do_install() {
+	vmove usr/include usr
 }
diff --git a/srcpkgs/giggle/giggle.rshlibs b/srcpkgs/giggle/giggle.rshlibs
index 7ea890c911a..389be748cef 100644
--- a/srcpkgs/giggle/giggle.rshlibs
+++ b/srcpkgs/giggle/giggle.rshlibs
@@ -1,15 +1,4 @@
 libgiggle-git.so.0
-libebook-1.2.so.12
-libcamel-1.2.so.29
-libdl.so.2
-libplc4.so
-libplds4.so
-libnspr4.so
-libssl3.so
-libsmime3.so
-libnss3.so
-libedataserver-1.2.so.15
-libsqlite3.so.0
 libxml2.so.2
 libgconf-2.so.4
 libsoup-2.4.so.1
@@ -18,14 +7,11 @@ libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
 libgio-2.0.so.0
-libpangoft2-1.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
-libfreetype.so.6
-libfontconfig.so.1
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0
@@ -36,3 +22,5 @@ libc.so.6
 libgiggle.so.0
 libvte2_90.so.9
 libX11.so.6
+libebook-1.2.so.13
+libedataserver-1.2.so.16
diff --git a/srcpkgs/giggle/libgiggle.rshlibs b/srcpkgs/giggle/libgiggle.rshlibs
index ee7a2a0b755..f22d254b20f 100644
--- a/srcpkgs/giggle/libgiggle.rshlibs
+++ b/srcpkgs/giggle/libgiggle.rshlibs
@@ -3,14 +3,11 @@ libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
 libgio-2.0.so.0
-libpangoft2-1.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
-libfreetype.so.6
-libfontconfig.so.1
 libgobject-2.0.so.0
 libgmodule-2.0.so.0
 libgthread-2.0.so.0
diff --git a/srcpkgs/giggle/libgiggle.template b/srcpkgs/giggle/libgiggle.template
index 6ab0ee398b3..f19ced11189 100644
--- a/srcpkgs/giggle/libgiggle.template
+++ b/srcpkgs/giggle/libgiggle.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the giggle runtime lib(s)."
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index a9e876c4179..bf0ab49bce4 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -1,22 +1,22 @@
 # Template file for 'giggle'
 pkgname=giggle
 version=0.6.1
-homepage="http://live.gnome.org/giggle"
-distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-configure_args="--enable-evolution-data-server"
 revision=2
-makedepends="pkg-config itstool intltool gtksourceview-devel vte3-devel evolution-data-server-devel"
-fulldepends="git desktop-file-utils hicolor-icon-theme"
+homepage="http://live.gnome.org/giggle"
 short_desc="Git repository viewer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+# Required by glib-2.32.
+CFLAGS="-lgmodule-2.0"
+build_style=gnu-configure
+configure_args="--enable-evolution-data-server"
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="pkg-config itstool intltool gtksourceview-devel vte3-devel evolution-data-server-devel"
+fulldepends="git"
+subpackages="lib${pkgname} ${pkgname}-devel"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 checksum=6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8
 long_desc="
  Giggle is a graphical frontend for the git content tracker
  (think of gitk on GTK+)."
-
-subpackages="lib${pkgname} ${pkgname}-devel"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
-