diff --git a/README.md b/README.md
index 83653282..4fdf5077 100644
--- a/README.md
+++ b/README.md
@@ -987,6 +987,12 @@ Allows users to use flight on your server while in Survival mode, if they have a
 
     -e ALLOW_FLIGHT=TRUE|FALSE
 
+### Other server property mappings:
+
+Environment Variable | Server Property
+---------------------|-----------------
+PLAYER_IDLE_TIMEOUT  | player-idle-timeout
+
 ## Miscellaneous Options
 
 ### Running as alternate user/group ID
diff --git a/start-finalSetup04ServerProperties b/start-finalSetup04ServerProperties
index 91919a79..d5ef5503 100644
--- a/start-finalSetup04ServerProperties
+++ b/start-finalSetup04ServerProperties
@@ -76,6 +76,7 @@ function customizeServerProps {
   setServerProp "level-type" "${LEVEL_TYPE^^}"
   setServerProp "resource-pack" "$RESOURCE_PACK"
   setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
+  setServerProp "player-idle-timeout" "$PLAYER_IDLE_TIMEOUT"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in