diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index f7576ec5..fb99bcc5 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -28,6 +28,9 @@ EXPOSE 25565 25575
 
 ADD https://github.com/itzg/restify/releases/download/1.0.4/restify_linux_amd64 /usr/local/bin/restify
 ADD https://github.com/itzg/rcon-cli/releases/download/1.3/rcon-cli_linux_amd64 /usr/local/bin/rcon-cli
+ADD https://github.com/itzg/mc-server-runner/releases/download/1.1.0/mc-server-runner_1.1.0_linux_amd64.tar.gz /tmp
+RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner_1.1.0_linux_amd64.tar.gz mc-server-runner && \
+  rm /tmp/mc-server-runner_1.1.0_linux_amd64.tar.gz
 COPY mcadmin.jq /usr/share
 RUN chmod +x /usr/local/bin/*
 
@@ -44,4 +47,4 @@ ENV JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
 
 COPY start* /
 
-USER minecraft
\ No newline at end of file
+USER minecraft
diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup
index 34a3bd6e..0277c0c6 100755
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -91,13 +91,12 @@ if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
 
     cd ${FTB_DIR}
     echo "Running FTB server modpack start ..."
-    exec ${FTB_SERVER_START}
+    exec mc-server-runner ${FTB_SERVER_START}
 else
     # If we have a bootstrap.txt file... feed that in to the server stdin
-    if [ -f /data/bootstrap.txt ];
-    then
-        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
-    else
-        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+    if [ -f /data/bootstrap.txt ]; then
+      bootstrapArgs="--bootstrap /data/bootstrap.txt"
     fi
+
+    exec mc-server-runner ${bootstrapArgs} java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
 fi