diff --git a/craftbukkit b/craftbukkit
index b8f784b..ec34381 100644
--- a/craftbukkit
+++ b/craftbukkit
@@ -51,6 +51,8 @@ case "$1" in
       log_daemon_msg "Stopping Minecraft Server" "Craftbukkit"
       sudo -u ${USER} tmux send-keys -t craftbukkit-console "say NOTICE: Server shutting down in 5 seconds!" C-m  >/dev/null 2>&1
       sleep 5
+      sudo -u ${USER} tmux send-keys -t craftbukkit-console "save-all" C-m >/dev/null 2>&1
+      sleep 1
       sudo -u ${USER} tmux send-keys -t craftbukkit-console "stop" C-m  >/dev/null 2>&1
       sleep 10
       if [ -n "$(pgrep -f -n $JARNAME)" ]; then