diff --git a/srcpkgs/geoclue/geoclue-devel.template b/srcpkgs/geoclue/geoclue-devel.template
index 06ce92150d..b7306cf894 100644
--- a/srcpkgs/geoclue/geoclue-devel.template
+++ b/srcpkgs/geoclue/geoclue-devel.template
@@ -5,20 +5,18 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 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
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template
index febcc7a3ee..13ad8d3f05 100644
--- a/srcpkgs/geoclue/template
+++ b/srcpkgs/geoclue/template
@@ -1,7 +1,7 @@
 # Template file for 'geoclue'
 pkgname=geoclue
 version=0.12.0
-distfiles="http://folks.o-hand.com/jku/geoclue-releases/geoclue-$version.tar.gz"
+distfiles="http://launchpad.net/geoclue/trunk/0.12/+download/geoclue-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-networkmanager=no --enable-conic=no"
 short_desc="The Geoinformation Service"
@@ -18,14 +18,17 @@ 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
+Add_dependency build libxslt
+
+pre_build()
+{
+	# ETOOMANYWARNINGS
+	sed -i -e "s|-Werror||g" src/Makefile
+}