diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index d3555f4e..9c946bc9 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -71,7 +71,7 @@ ENV UID=1000 GID=1000 \
   JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true
+  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server"
 
 COPY start* /
 RUN dos2unix /start* && chmod +x /start*
diff --git a/minecraft-server/README.md b/minecraft-server/README.md
index 6f1fbf80..b6d7b0fe 100644
--- a/minecraft-server/README.md
+++ b/minecraft-server/README.md
@@ -444,6 +444,11 @@ this server instance.
 
 ## Server configuration
 
+### Server name
+
+The server name (e.g. for bungeecord) can be set like:
+    docker run -d -e SERVER_NAME=MyServer ...
+
 ### Server port
 
 The server port can be set like:
diff --git a/minecraft-server/start-finalSetup04ServerProperties b/minecraft-server/start-finalSetup04ServerProperties
index e07aa0bc..17cd52ab 100755
--- a/minecraft-server/start-finalSetup04ServerProperties
+++ b/minecraft-server/start-finalSetup04ServerProperties
@@ -50,6 +50,7 @@ if [ ! -e $SERVER_PROPERTIES ]; then
     MOTD="A ${label} Minecraft Server powered by Docker"
   fi
 
+  setServerProp "server-name" "$SERVER_NAME"
   setServerProp "server-port" "$SERVER_PORT"
   setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"