diff --git a/srcpkgs/giggle-devel b/srcpkgs/giggle-devel
new file mode 120000
index 0000000000..81321c2730
--- /dev/null
+++ b/srcpkgs/giggle-devel
@@ -0,0 +1 @@
+giggle
\ No newline at end of file
diff --git a/srcpkgs/giggle/giggle-devel.template b/srcpkgs/giggle/giggle-devel.template
new file mode 100644
index 0000000000..c622c1574e
--- /dev/null
+++ b/srcpkgs/giggle/giggle-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'giggle-devel'.
+#
+short_desc="${short_desc} - Development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run lib${sourcepkg}
+
+do_install()
+{
+        vmove usr/include usr
+        #vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/giggle/libgiggle.template b/srcpkgs/giggle/libgiggle.template
new file mode 100644
index 0000000000..7efc4cc2a3
--- /dev/null
+++ b/srcpkgs/giggle/libgiggle.template
@@ -0,0 +1,22 @@
+# Template file for 'libgiggle'.
+#
+short_desc="${short_desc} - Runtime libraries"
+long_desc="${long_desc}
+
+ This package contains the giggle runtime lib(s)."
+
+Add_dependency run glibc
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run gtk+3
+Add_dependency run gtksourceview
+
+do_install()
+{
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
new file mode 100644
index 0000000000..e58fd66e49
--- /dev/null
+++ b/srcpkgs/giggle/template
@@ -0,0 +1,48 @@
+# 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"
+short_desc="Git repository viewer"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+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"
+
+Add_dependency run glibc
+Add_dependency run libgiggle
+Add_dependency run evolution-data-server
+Add_dependency run nspr
+Add_dependency run nss
+Add_dependency run sqlite
+Add_dependency run libxml2
+Add_dependency run GConf
+Add_dependency run libsoup
+Add_dependency run gtksourceview
+Add_dependency run gtk+3
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run vte3
+Add_dependency run libX11
+
+Add_dependency build pkg-config
+Add_dependency build itstool
+Add_dependency build gtksourceview-devel
+Add_dependency build vte3-devel
+Add_dependency build evolution-data-server-devel
+
+Add_dependency full git
+Add_dependency full desktop-file-utils
+Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/libgiggle b/srcpkgs/libgiggle
new file mode 120000
index 0000000000..81321c2730
--- /dev/null
+++ b/srcpkgs/libgiggle
@@ -0,0 +1 @@
+giggle
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index e0a6cc34a5..120564cc7f 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -917,3 +917,5 @@ libraptor2.so.0			libraptor		raptor-devel
 liblrdf.so.2			liblrdf			liblrdf-devel
 libserd-0.so.0			libserd			serd-devel
 libsord-0.so.0			libsord			sord-devel
+libgiggle.so.0			libgiggle		giggle-devel
+libgiggle-git.so.0		libgiggle		giggle-devel