diff --git a/README.rst b/README.rst
index ca6882b..04658ea 100644
--- a/README.rst
+++ b/README.rst
@@ -276,7 +276,7 @@ Ubuntu and derivatives
 
 - KDE neon (based on Ubuntu 16.04)
 - Linux Mint 17/18
-- Ubuntu 14.04/16.04 and subsequent non-TLS releases (see below)
+- Ubuntu 14.04/16.04/18.04 and subsequent non-LTS releases (see below)
 
 Ubuntu Best Effort Support: Non-LTS Releases
 ********************************************
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 04f8caf..578a136 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1373,6 +1373,9 @@ __ubuntu_codename_translation() {
         "17")
             DISTRO_CODENAME="artful"
             ;;
+        "18")
+            DISTRO_CODENAME="bionic"
+            ;;
         *)
             DISTRO_CODENAME="trusty"
             ;;
@@ -2568,13 +2571,17 @@ __enable_universe_repository() {
 
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS ubuntu
-    if [ "$DISTRO_MAJOR_VERSION" -gt 16 ]; then
-        echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages from latest LTS release. You may experience problems."
+    if [ "$DISTRO_MAJOR_VERSION" -eq 17 ]; then
+        echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for 16.04 LTS release. You may experience problems."
         UBUNTU_VERSION=16.04
         UBUNTU_CODENAME="xenial"
+    elif [ "$DISTRO_MAJOR_VERSION" -gt 18 ]; then
+        echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems."
+        UBUNTU_VERSION=18.04
+        UBUNTU_CODENAME="bionic"
     else
-        UBUNTU_VERSION=$DISTRO_VERSION
-        UBUNTU_CODENAME=$DISTRO_CODENAME
+        UBUNTU_VERSION=${DISTRO_VERSION}
+        UBUNTU_CODENAME=${DISTRO_CODENAME}
     fi
 
     __PACKAGES=''