diff --git a/common/options.description b/common/options.description
index 17cce97f14..2e7b38e193 100644
--- a/common/options.description
+++ b/common/options.description
@@ -13,6 +13,7 @@ desc_option_efi="Enable support for EFI"
 desc_option_expat="Enable support for XML via expat"
 desc_option_framebuffer="Enable support for the Framebuffer"
 desc_option_gdk_pixbuf="Enable support to use transparency via gdk-pixbuf"
+desc_option_geoclue2="Enable support for geolocation (v2)"
 desc_option_gif="Enable support for GIF images"
 desc_option_gir="Enable support for gobject introspection data"
 desc_option_gles2="Enable support for GLES (v2)"
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index cefc64098d..ce8e01c280 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,28 +1,25 @@
 # Template file for 'redshift'
 pkgname=redshift
 version=1.10
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config automake libtool gettext-devel git intltool"
-configure_args="--enable-gui $(vopt_enable geoclue)"
-makedepends="libXxf86vm-devel $(vopt_if geoclue "geoclue-devel GConf-devel") python3.4 pygtk-devel python-xdg"
+build_options="geoclue2"
+configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)
+ ac_cv_path_PYTHON=/usr/bin/python3.4"
+hostmakedepends="pkg-config intltool gettext-devel python3.4-devel"
+makedepends="libXxf86vm-devel libdrm-devel $(vopt_if geoclue2 'geoclue2 glib-devel')"
+depends="$(vopt_if geoclue2 geoclue2)"
 short_desc="Adjusts the color temperature of your screen to your surroundings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://jonls.dk/redshift/"
+distfiles="https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"
+checksum=5bc2e70aa414f42dafb45c6e06ea90157d7d4b298af48877144ff442639aeea6
 
-do_fetch() {
-	git clone -b v${version} git://github.com/jonls/redshift.git redshift-${version}
-}
-
-# Package build options
-build_options="geoclue"
-
-pre_configure() {
-	./bootstrap
-}
 redshift-gtk_package() {
-	depends="python3.4 pygtk python-xdg hicolor-icon-theme desktop-file-utils ${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision} gtk+3 python3.4-gobject
+	 python3.4-xdg desktop-file-utils"
+	pycompile_version="3.4"
 	pycompile_module="redshift_gtk"
 	short_desc+=" - GTK+ UI"
 	pkg_install() {