diff --git a/srcpkgs/gparted/files/gparted-pkexec b/srcpkgs/gparted/files/gparted-pkexec
index 579208c5ccd..f793e8d9a8c 100644
--- a/srcpkgs/gparted/files/gparted-pkexec
+++ b/srcpkgs/gparted/files/gparted-pkexec
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkexec /usr/sbin/gparted "$@"
+pkexec --disable-internal-agent "/usr/bin/gparted" "$@"
diff --git a/srcpkgs/gparted/files/org.void.pkexec.gparted.policy b/srcpkgs/gparted/files/org.void.pkexec.gparted.policy
index 8f3ea4dcfe4..a9682197c4b 100644
--- a/srcpkgs/gparted/files/org.void.pkexec.gparted.policy
+++ b/srcpkgs/gparted/files/org.void.pkexec.gparted.policy
@@ -12,7 +12,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index a5863b664a9..ced83ad7118 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,15 +1,17 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=0.16.2
+version=0.17.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper --enable-libparted-dmraid"
+configure_args="--enable-libparted-dmraid --sbindir=/usr/bin"
+hostmakedepends="pkg-config which intltool gnome-doc-utils"
+makedepends="libuuid-devel libparted-devel gtkmm2-devel"
 short_desc="Gnome Partition Editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gparted.sourceforge.net"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=fc8fd3c5c2153c063bd2fdbfb54e525b72e2ceb8d060f8bb60e3386bb6f35d72
+checksum=81ab2114569c9692b7dfea62b320b333b832dd595faffdb67b3321606bc6fbc3
 long_desc="
  GParted is a free partition editor for graphically managing your disk
  partitions.
@@ -22,15 +24,13 @@ long_desc="
  partitions. GParted enables you to reorganize your disk partitions while
  preserving the contents of these partitions."
 
-hostmakedepends="pkg-config which intltool gnome-doc-utils"
-makedepends="libuuid-devel libparted-devel gtkmm2-devel"
+pre_configure() {
+	sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted-pkexec %f:g" gparted.desktop.in.in
+}
 
 post_install() {
-	vinstall ${FILESDIR}/org.void.pkexec.gparted.policy \
-		644 /usr/share/polkit-1/actions
+	vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions
 	vinstall ${FILESDIR}/gparted-pkexec 755 usr/bin
-	sed -i -e "s/Exec=.*/Exec=gparted-pkexec/" \
-		${DESTDIR}/usr/share/applications/gparted.desktop
 }
 
 gparted_package() {