diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh
index f47e08d8..78731c01 100755
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -41,11 +41,11 @@ case "$TYPE" in
     TYPE=SPIGOT
     case "$TYPE" in
       *BUKKIT|*bukkit)
-        echo "Downloading latest CraftBukkit 1.8 server ..."
+        echo "Downloading latest CraftBukkit $VANILLA_VERSION server ..."
         SERVER=craftbukkit_server.jar
         ;;
       *)
-        echo "Downloading latest Spigot 1.8 server ..."
+        echo "Downloading latest Spigot $VANILLA_VERSION server ..."
         SERVER=spigot_server.jar
         ;;
     esac
@@ -53,6 +53,9 @@ case "$TYPE" in
       1.8*)
         URL=/spigot18/$SERVER
         ;;
+      1.9*)
+        URL=/spigot19/$SERVER
+        ;;
       *)
         echo "That version of $SERVER is not available."
         exit 1
@@ -126,7 +129,7 @@ case "X$WORLD" in
     if [ ! -d /data/world ]; then
       echo World directory not found
       for i in /data/*/level.dat; do
-        if [ -f "$i" ]; then	
+        if [ -f "$i" ]; then
           d=`dirname "$i"`
           echo Renaming world directory from $d
           mv -f "$d" /data/world