diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8632efadbe..9ac65d54c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -87,6 +87,7 @@ public final class CraftServer implements Server {
         configuration.getString("database.password", "walrus");
         configuration.getString("database.driver", "org.sqlite.JDBC");
         configuration.getString("database.isolation", "SERIALIZABLE");
+        configuration.getString("settings.update-folder", "update");
     }
 
     public void loadPlugins() {
@@ -239,6 +240,10 @@ public final class CraftServer implements Server {
 
     // End Temporary calls
 
+    public String getUpdateFolder() {
+        return this.configuration.getString("settings.update-folder", "update");
+    }
+
     public PluginManager getPluginManager() {
         return pluginManager;
     }