diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index ec8686e9..3b4220f5 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -46,4 +46,4 @@ 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= ONLINE_MODE=TRUE CONSOLE=true
+    LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true
diff --git a/minecraft-server/README.md b/minecraft-server/README.md
index bfcaafcf..5fe782a5 100644
--- a/minecraft-server/README.md
+++ b/minecraft-server/README.md
@@ -456,6 +456,11 @@ this server instance.
 
 ## Server configuration
 
+### Server port
+
+The server port can be set like:
+    docker run -d -e SERVER_PORT=25565 ...
+
 ### Difficulty
 
 The difficulty level (default: `easy`) can be set like:
diff --git a/minecraft-server/start-finalSetup04ServerProperties b/minecraft-server/start-finalSetup04ServerProperties
index 613a753f..cf417a2e 100755
--- a/minecraft-server/start-finalSetup04ServerProperties
+++ b/minecraft-server/start-finalSetup04ServerProperties
@@ -29,6 +29,7 @@ if [ ! -e $SERVER_PROPERTIES ]; then
     setServerProp "white-list" "true"
   fi
 
+  setServerProp "server-port" "$SERVER_PORT"
   setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"
   setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"