diff --git a/srcpkgs/geoclue-devel b/srcpkgs/geoclue-devel
new file mode 120000
index 00000000000..40487d3141f
--- /dev/null
+++ b/srcpkgs/geoclue-devel
@@ -0,0 +1 @@
+geoclue
\ No newline at end of file
diff --git a/srcpkgs/geoclue/depends b/srcpkgs/geoclue/depends
new file mode 100644
index 00000000000..f90b51d01a5
--- /dev/null
+++ b/srcpkgs/geoclue/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.12.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/geoclue/geoclue-devel.template b/srcpkgs/geoclue/geoclue-devel.template
new file mode 100644
index 00000000000..06ce92150d6
--- /dev/null
+++ b/srcpkgs/geoclue/geoclue-devel.template
@@ -0,0 +1,24 @@
+# Template file for 'geoclue-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run glib-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run libxml2-devel
+Add_dependency run libsoup-devel
+Add_dependency run GConf-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template
new file mode 100644
index 00000000000..febcc7a3ee6
--- /dev/null
+++ b/srcpkgs/geoclue/template
@@ -0,0 +1,31 @@
+# Template file for 'geoclue'
+pkgname=geoclue
+version=0.12.0
+distfiles="http://folks.o-hand.com/jku/geoclue-releases/geoclue-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--enable-networkmanager=no --enable-conic=no"
+short_desc="The Geoinformation Service"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=0f533f177ae9aa35e807a01c754840f66df9579f5524552f14f2b5ba670a4696
+long_desc="
+ Geoclue is a modular geoinformation service built on top of the D-Bus
+ messaging system. The goal of the Geoclue project is to make creating
+ location-aware applications as simple as possible."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run libxml2
+Add_dependency run libsoup
+Add_dependency run GConf
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build glib-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libxml2-devel
+Add_dependency build libsoup-devel
+Add_dependency build GConf-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 52fc20c75a2..c86ee4fe995 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -799,3 +799,4 @@ libtelepathy-logger.so		telepathy-logger	telepathy-logger-devel
 libmission-control-plugins.so	telepathy-mission-control	telepathy-mission-control-devel
 libclutter-gtk-1.0.so		clutter-gtk		clutter-gtk-devel
 libchamplain-0.10.so		libchamplain		libchamplain-devel
+libgeoclue.so			geoclue			geoclue-devel