diff --git a/01-install-base-files b/01-install-base-files
index 5e04692..a9b4989 100755
--- a/01-install-base-files
+++ b/01-install-base-files
@@ -2,6 +2,9 @@
 
 umask 022
 
+# Create /opt directories.
+mkdir -p -m 755 {/opt,/opt/{bin,include,info,lib64,man,man/man{0..8},sbin,share}}
+
 # Install the LetsEncrypt CA bundles, to stop wget moaning.
 cp -R ca-certificates /usr/local/share
 update-ca-certificates
@@ -15,14 +18,14 @@ cat root.crontab >/var/spool/cron/crontabs/root
 /etc/rc.d/rc.crond restart
 
 # Install the /etc files.
-cd base-files
-IFS=$'\n'
-for dir in $(find . -type d | sort | sed -re 's/^\.\///'); do
-  mkdir -p -m 755 /etc/$dir
-done
-for file in $(find . -type f | sort | sed -re 's/^\.\///'); do
-  cat "$file" >"/etc/$file"
-done
+( cd base-files
+  IFS=$'\n'
+  for dir in $(find . -type d | sort | sed -re 's/^\.\///'); do
+    mkdir -p -m 755 /etc/$dir
+  done
+  for file in $(find . -type f | sort | sed -re 's/^\.\///'); do
+    cat "$file" >"/etc/$file"
+  done )
 
 # Correct file/directory specific permissions.
 chmod 755 /etc/cron.daily/update-slackpkg-template
@@ -39,6 +42,10 @@ chmod 755 /etc/profile.d/optpaths.csh
 chmod 755 /etc/profile.d/optpaths.sh
 chmod 750 /etc/sudoers.d
 
+# Install pushover.
+cp utils/pushover /opt/bin
+chmod 755 /opt/bin/pushover
+
 # Decrypt the pushover-config.
 echo "Decrypting /etc/pushover/pushover-config..."
 gpg -d -o /etc/pushover/pushover-config /etc/pushover/pushover-config.gpg
diff --git a/02-system-setup b/02-system-setup
index 4924f0c..97778cc 100755
--- a/02-system-setup
+++ b/02-system-setup
@@ -32,9 +32,6 @@ gpg -c -o /etc/shadow.gpg /etc/shadow
 echo "Encrypting /etc/gshadow..."
 gpg -c -o /etc/gshadow.gpg /etc/gshadow
 
-# Create /opt directories.
-mkdir -p -m 755 {/opt,/opt/{bin,include,info,lib64,man,man/man{0..8},sbin,share}}
-
 # Create log archive directories and move old log files.
 [ ! -d /var/log/Archived/pre-sysconfig ] && {
   mkdir -p -m 750 /var/log/Archived