diff --git a/bibliotecha.sh b/bibliotecha.sh
index 5c87ce0..26f3b8d 100755
--- a/bibliotecha.sh
+++ b/bibliotecha.sh
@@ -9,7 +9,7 @@
 #       Digital books need libraries too
 #
 # This install script is intended for use with Debian based
-# distributions. More specifically, Debian Stretch, which is 
+# distributions. More specifically, Debian Buster, which is 
 # currently the latest distribution release from the Debian 
 # project.
 #
@@ -80,46 +80,49 @@ function show_bibliotecha_banner {
 
 function show_introduction_text {
   echo ""
-  echo "Welcome to the Bibliotecha installation script"
+  echo "Welcome to the Bibliotecha automatic installation script"
   echo ""
-  echo "This script will setup the following infrastructure:"
+  echo "This script will attempt to setup the following infrastructure:"
   echo ""
   echo "* A Python 3 environment"
-  echo "* A Wifi hotspot, DNS server and DHCP service"
-  echo "* A Lighttpd web server"
-  echo "* A Calibre server"
+  echo "* A Wifi hotspot with DNS DHCP services enabled"
+  echo "* A web server"
+  echo "* A Calibre library"
   echo "* A Calibre-web service"
   echo ""
   echo "Once the script is finished, please see post-install steps"
   echo "that are documented and available from the Bibliotecha manual:"
   echo ""
-  echo "            https://manual.bibliotecha.info/#TODO"
+  echo "            https://manual.bibliotecha.info/#post-installation"
+  echo ""
+  echo "If anything goes wrong, please see the troubleshooting guide"
+  echo ""
+  echo "            https://manual.bibliotecha.info/#troubleshooting"
   echo ""
 
   await_any_key
 }
 
-function ensure_stretch_based_distribution {
+function ensure_buster_based_distribution {
   echo "Checking distribution ..." 
 
-  local installing_on_stretch_based=1
+  local installing_on_buster_based=1
 
   if [ ! -f /etc/apt/sources.list ]; then
-    installing_on_stretch_based=
+    installing_on_buster_based=
   else
-    if ! grep -q 'stretch' /etc/apt/sources.list; then
-        installing_on_stretch_based=
+    if ! grep -q 'buster' /etc/apt/sources.list; then
+        installing_on_buster_based=
     fi
     if ! grep -q 'debian' /etc/apt/sources.list; then
         if ! grep -q 'raspbian' /etc/apt/sources.list; then
-            installing_on_stretch_based=
+            installing_on_buster_based=
         fi
     fi
   fi
 
-  if [ ! $installing_on_stretch_based ]; then
-    echo "You should only run this on a Debian Stretch based system"
-    echo "Cannot continue ..."
+  if [ ! $installing_on_buster_based ]; then
+    echo "You should only run this on a Debian Buster based system"
     exit 1
   fi
 }
@@ -369,7 +372,7 @@ function reboot_system {
 
 function run_installation {
   ensure_root_account
-  ensure_stretch_based_distribution
+  ensure_buster_based_distribution
 
   show_bibliotecha_banner
   show_introduction_text