diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
index f75d529d67f..24775145b8e 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Setting up automatic login..."
+DESCRIPTION="Setting up automatic login"
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu b/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
index b3671923d74..3a6a1b991d7 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Grant administrative PolicyKit pivilieges to default user..."
+DESCRIPTION="Modifying PolicyKit grants for '$USERNAME' user"
 
 prereqs()
 {
@@ -18,6 +18,10 @@ esac
 
 . /scripts/casper-functions
 
+# Check that polkit is installed.
+if [ ! -x "/root/usr/libexec/polkitd" ]; then
+	exit 0
+fi
 log_begin_msg "$DESCRIPTION"
 
 # configure PolicyKit in live session
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index fe3a655c106..58f2930b81d 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -1,6 +1,8 @@
 # Template file for 'xbps-casper'
 pkgname=xbps-casper
-version=0.6.ubuntu1.236
+_localver=0.7	# XBPS package version
+_distver=1.236	# This should match the upstream (Ubuntu) version
+version=${_localver}.${_distver}
 build_style=custom-install
 short_desc="Run a live preinstalled system from read-only media"
 maintainer="Juan RP <xtraeme@gmail.com>"