diff --git a/srcpkgs/Thunar/Thunar-devel.template b/srcpkgs/Thunar/Thunar-devel.template
index b43c15d6ac7..618007d5d7a 100644
--- a/srcpkgs/Thunar/Thunar-devel.template
+++ b/srcpkgs/Thunar/Thunar-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'Thunar-devel'.
 #
-depends="glib-devel gtk+-devel Thunar>=1.4.0"
+noarch=yes
+depends="glib-devel gtk+-devel Thunar>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-noarch=yes
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/Thunar/files/org.freedesktop.udisks.pkla b/srcpkgs/Thunar/files/org.freedesktop.udisks.pkla
deleted file mode 100644
index 5cc443bd117..00000000000
--- a/srcpkgs/Thunar/files/org.freedesktop.udisks.pkla
+++ /dev/null
@@ -1,7 +0,0 @@
-[Local Users]
-#Identity=unix-user: your_username
-Identity=unix-group:storage
-Action=org.freedesktop.udisks.*
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 468990acaff..5eb1edf2f68 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,21 +1,16 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=1.4.0
-revision=3
+version=1.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-gio-unix --enable-dbus --enable-gudev --enable-exif
---enable-pcre --enable-notifications"
-depends="gvfs hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool pcre-devel>=8.30 glib-devel>=2.32.3_2
-libgudev-devel libnotify-devel
-libxfce4util-devel libxfce4ui-devel gtk+-devel dbus-glib-devel
-libexif-devel exo-devel xfce4-panel-devel startup-notification-devel"
+configure_args="--enable-gio-unix --enable-dbus --enable-gudev
+ --enable-exif --enable-pcre --disable-static --enable-notifications"
 short_desc="Thunar File Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://thunar.xfce.org"
 license="GPL-2, LGPL-2.1"
-distfiles="http://archive.xfce.org/src/xfce/thunar/1.4/Thunar-$version.tar.bz2"
-checksum=2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba
+distfiles="http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-${version}.tar.bz2"
+checksum=354897fbde4d3f089c06c38b57816f455c2907806725906426440e1084c1d63a
 long_desc="
  Thunar is a new modern file manager for the Xfce Desktop Environment.
  It has been designed from the ground up to be fast and easy-to-use.
@@ -23,14 +18,10 @@ long_desc="
  confusing or useless options. Thunar is fast and responsive with a
  good start up time and directory load time."
 
-conf_files="/etc/xdg/Thunar/uca.xml"
+subpackages="${pkgname}-devel"
 
-subpackages="$pkgname-devel"
-make_dirs="/etc/polkit-1/localauthority 0700 root root"
-
-post_install() {
-	# install udisks permission file
-	install -dm755 ${DESTDIR}/etc/polkit-1/localauthority/50-local.d
-	install -m644 ${FILESDIR}/org.freedesktop.udisks.pkla \
-		${DESTDIR}/etc/polkit-1/localauthority/50-local.d/
-}
+depends="gvfs hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool pcre-devel>=8.30 glib-devel>=2.32.3_2
+ libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel
+ gtk+-devel dbus-glib-devel libexif-devel exo-devel xfce4-panel-devel
+ startup-notification-devel systemd-devel"