diff --git a/build.xml b/build.xml
index f18a9482e..86f061d18 100644
--- a/build.xml
+++ b/build.xml
@@ -36,6 +36,7 @@
       <attribute name="WorldEdit-Version" value="${version}"/>
       <attribute name="Class-Path" value="jnbt.jar truezip.jar"/>
     </manifest>
+    <copy tofile="${build.dir}/plugin.yml" file="plugin.yml"/>
     <jar jarfile="${dist.dir}/WorldEdit.jar" basedir="${build.dir}" manifest="manifest.mf"/>
   </target>
 
diff --git a/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 7ea755e92..a4fc11fe1 100644
--- a/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -42,12 +42,6 @@ public class WorldEditPlugin extends JavaPlugin {
             PluginDescriptionFile desc, File plugin, ClassLoader cLoader) {
         super(pluginLoader, instance, desc, plugin, cLoader);
 
-        registerEvents();
-    }
-
-    public void onEnable() {
-        //loadConfiguration();
-        
         ServerInterface.setup(new BukkitServerInterface(getServer()));
 
         controller.profile = true;
@@ -66,13 +60,19 @@ public class WorldEditPlugin extends JavaPlugin {
         controller.noDoubleSlash = true;
         controller.useInventory = false;
         controller.useInventoryOverride = false;
+
+        registerEvents();
+    }
+
+    public void onEnable() {
+        //loadConfiguration();
     }
 
     public void onDisable() {
         controller.clearSessions();
     }
 
-    private void registerEvents() {
+    private void registerEvents() {        
         getServer().getPluginManager().registerEvent(Event.Type.PLAYER_QUIT,
                 playerListener, Priority.Normal, this);
         getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND,