diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7d9d7d0fe9f..18061c11d52 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,12 +1,8 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-_distver=2.20
-_patchver=".1"
-version=${_distver}${_patchver}
-revision=2
-wrksrc=${pkgname}-${version}
-#distfiles="${KERNEL_SITE}/utils/${pkgname}/v${_distver}/${pkgname}-${version}.tar.bz2"
-distfiles="ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${version}.tar.bz2"
+version=2.20.1
+revision=3
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.20/${pkgname}-${version}.tar.bz2"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@@ -29,23 +25,21 @@ Add_dependency build gettext
 Add_dependency build zlib-devel
 Add_dependency build ncurses-devel
 
-do_configure()
-{
+do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} \
 		--enable-partx --enable-write \
 		--enable-libuuid --disable-makeinstall-chown \
 		--enable-libblkid --enable-fsck --disable-rpath \
-		--enable-libmount-mount
+		--enable-libmount-mount \
+		SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
 }
 
-do_build()
-{
+do_build() {
 	sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	make DESTDIR=${DESTDIR} install
 	# Move logger to /bin.
 	vmkdir bin