diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 1c199dc2..04fc9216 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -27,10 +27,6 @@ public class SimpleCommandMap implements CommandMap {
 
     static {
         fallbackCommands.add(new ListCommand());
-        fallbackCommands.add(new StopCommand());
-        fallbackCommands.add(new SaveCommand());
-        fallbackCommands.add(new SaveOnCommand());
-        fallbackCommands.add(new SaveOffCommand());
         fallbackCommands.add(new OpCommand());
         fallbackCommands.add(new DeopCommand());
         fallbackCommands.add(new BanIpCommand());
@@ -66,6 +62,10 @@ public class SimpleCommandMap implements CommandMap {
     }
 
     private void setDefaultCommands(final Server server) {
+        register("bukkit", new SaveCommand());
+        register("bukkit", new SaveOnCommand());
+        register("bukkit", new SaveOffCommand());
+        register("bukkit", new StopCommand());
         register("bukkit", new VersionCommand("version"));
         register("bukkit", new ReloadCommand("reload"));
         register("bukkit", new PluginsCommand("plugins"));