diff --git a/srcpkgs/xbps-casper/files/scripts/casper b/srcpkgs/xbps-casper/files/scripts/casper
index 2ad65c8953d..ffe7329cf03 100644
--- a/srcpkgs/xbps-casper/files/scripts/casper
+++ b/srcpkgs/xbps-casper/files/scripts/casper
@@ -23,6 +23,7 @@ tried=/tmp/tried
 [ -f /etc/casper.conf ] && . /etc/casper.conf
 export USERNAME USERFULLNAME HOST BUILD_SYSTEM
 
+. /scripts/functions
 . /scripts/casper-helpers
 
 if [ ! -f /casper.vars ]; then
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints b/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
index d85b2dab0a0..5a53736e285 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up /cdrom mountpoint"
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser b/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
index f1896097b41..7d58f823b2b 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up live session user '$USERNAME'"
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
index 3257de75aeb..1b640c51977 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up system keymap"
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab b/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
index 23f6cf26ae6..7f42918a61d 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab
@@ -4,7 +4,7 @@ PREREQ=""
 DESCRIPTION="Setting up /etc/fstab"
 FSTAB=${rootmnt}/etc/fstab
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
index e53ff5c1c79..37caa78f656 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap
@@ -4,7 +4,7 @@ PREREQ=""
 DESCRIPTION="Setting up swap"
 FSTAB=${rootmnt}/etc/fstab
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
index 5824fb085ca..5d4a58a236f 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up system locale"
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 prereqs()
 {
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
index 00f6e61b820..e12dc93d96d 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
@@ -3,6 +3,8 @@
 PREREQ=""
 DESCRIPTION="Setting up automatic login"
 
+[ -r /scripts/functions ] && . /scripts/functions
+
 prereqs()
 {
        echo "$PREREQ"
@@ -16,8 +18,6 @@ prereqs)
        ;;
 esac
 
-. /scripts/casper-functions
-
 log_begin_msg "$DESCRIPTION"
 
 # Enable autologin for getty(1).
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname b/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
index 9eba97dd141..a7e6828ab16 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up hostname"
 
-[ -r /scripts/casper-functions ] && . /scripts/casper-functions
+[ -r /scripts/functions ] && . /scripts/functions
 
 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 3a6a1b991d7..7e4bb1a8b21 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/44pk_allow_ubuntu
@@ -3,6 +3,8 @@
 PREREQ=""
 DESCRIPTION="Modifying PolicyKit grants for '$USERNAME' user"
 
+[ -r /scripts/functions ] && . /scripts/functions
+
 prereqs()
 {
        echo "$PREREQ"
@@ -16,8 +18,6 @@ prereqs)
        ;;
 esac
 
-. /scripts/casper-functions
-
 # Check that polkit is installed.
 if [ ! -x "/root/usr/libexec/polkitd" ]; then
 	exit 0
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index fa27e9931c5..1e51d2561fa 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-casper'
 pkgname=xbps-casper
-_localver=0.12	# XBPS package version
+_localver=0.13	# XBPS package version
 _distver=1.236	# This should match the upstream (Ubuntu) version
 version=${_localver}.${_distver}
 build_style=custom-install