diff --git a/guac-install-server.sh b/guac-install-server.sh
index 7b81543..481e94d 100644
--- a/guac-install-server.sh
+++ b/guac-install-server.sh
@@ -3,16 +3,26 @@
 VERSION="0.9.13"
 
 # Ubuntu and Debian have different names of the libjpeg-turbo library for some reason...
-if [ `egrep -c "ID=ubuntu" /etc/os-release` -gt 0 ]
+source /etc/lsb-release
+
+if [ $DISTRIB_ID == "Ubuntu" ]
 then
     JPEGTURBO="libjpeg-turbo8-dev"
 else
     JPEGTURBO="libjpeg62-turbo-dev"
 fi
 
+# Ubuntu 16.10 has a different name for libpng12-dev for some reason...
+if [ $DISTRIB_RELEASE == "16.10" ]
+then
+    LIBPNG="libpng-dev"
+else
+    LIBPNG="libpng12-dev"
+fi
+
 # Install Server Features
 apt update
-apt -y install build-essential libcairo2-dev $JPEGTURBO libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \
+apt -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavutil-dev \
 libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \
 libvorbis-dev libwebp-dev jq curl wget
 
@@ -23,6 +33,7 @@ then
     exit
 fi
 
+# Set SERVER to be the preferred download server from the Apache CDN
 SERVER=$(curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | jq --raw-output '.preferred|rtrimstr("/")')
 
 # Download Guacamole Files