diff --git a/.gitignore b/.gitignore
index cb01f66..9c558c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /geoclue-1.99.4.tar.xz
 /geoclue-2.0.0.tar.xz
 /geoclue-2.1.2.tar.xz
+/geoclue-2.1.6.tar.xz
diff --git a/geoclue2.spec b/geoclue2.spec
index 00fa051..48c8f54 100644
--- a/geoclue2.spec
+++ b/geoclue2.spec
@@ -1,6 +1,6 @@
 Name:           geoclue2
-Version:        2.1.2
-Release:        2%{?dist}
+Version:        2.1.6
+Release:        1%{?dist}
 Summary:        Geolocation service
 
 License:        GPLv2+
@@ -65,6 +65,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/geoclue
 # Remove demo files
 rm $RPM_BUILD_ROOT%{_datadir}/applications/geoclue-demo-agent.desktop
 rm $RPM_BUILD_ROOT%{_datadir}/applications/geoclue-where-am-i.desktop
+rm $RPM_BUILD_ROOT%{_libexecdir}/geoclue-2.0/demos/where-am-i
 
 
 %pre
@@ -90,7 +91,7 @@ exit 0
 
 %files
 %doc COPYING NEWS
-%{_sysconfdir}/geoclue.conf
+%config %{_sysconfdir}/geoclue/
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.GeoClue2.conf
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
 %{_libexecdir}/geoclue
@@ -109,6 +110,9 @@ exit 0
 
 
 %changelog
+* Fri Mar 07 2014 Kalev Lember <kalevlember@gmail.com> - 2.1.6-1
+- Update to 2.1.6
+
 * Thu Feb 06 2014 Kalev Lember <kalevlember@gmail.com> - 2.1.2-2
 - Add systemd rpm scripts
 - Don't install the demo .desktop files
diff --git a/sources b/sources
index 9b29363..ce6a3a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8db92cdbc24643e60eff7a2ac57cc558  geoclue-2.1.2.tar.xz
+56e455b0ae7c7c282fddaa9e6b2f1f2d  geoclue-2.1.6.tar.xz