diff --git a/srcpkgs/polkit/files/polkit-1.pam b/srcpkgs/polkit/files/polkit-1.pam
new file mode 100644
index 00000000000..04f53e0dbc1
--- /dev/null
+++ b/srcpkgs/polkit/files/polkit-1.pam
@@ -0,0 +1,7 @@
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+password        required        pam_unix.so
diff --git a/srcpkgs/polkit/files/polkitd.service b/srcpkgs/polkit/files/polkitd.service
index 3614de122bc..10f4afecf9f 100644
--- a/srcpkgs/polkit/files/polkitd.service
+++ b/srcpkgs/polkit/files/polkitd.service
@@ -6,7 +6,8 @@ After=syslog.target
 Type=dbus
 BusName=org.freedesktop.PolicyKit1
 ExecStart=/usr/libexec/polkitd
-StandardOutput=syslog
+StandardOutput=null
+StandardError=null
 
 [Install]
 # We pull this in by graphical.target instead of waiting for the bus
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 0242908448c..95794921aeb 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.102
-revision=1
+revision=2
 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-static --localstatedir=/var --with-os-type=gentoo"
@@ -38,16 +38,6 @@ Add_dependency build pam-devel
 
 post_install()
 {
-	mkdir -p ${DESTDIR}/etc/pam.d
-	cat > ${DESTDIR}/etc/pam.d/polkit-1 <<_EOF
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_unix.so
-password	required	pam_unix.so
-_EOF
-	chmod 644 ${DESTDIR}/etc/pam.d/polkit-1
+	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
 	vinstall ${FILESDIR}/polkitd.service 644 lib/systemd/system
 }