diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 174b53c1d..0ebd32ced 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+2.8:
+- Improved Bukkit support.
+
 2.7.2:
 - Fixed permissions checking for individual commands.
 - /butcher should now kill animals again.
diff --git a/build.xml b/build.xml
index d4b553704..ecdd20c6c 100644
--- a/build.xml
+++ b/build.xml
@@ -58,6 +58,7 @@
       <fileset dir="."/>
       <globmapper from="*.txt" to="*.txt"/>
     </copy>
+    <copy tofile="${release.dir}/config.yml" file="config.yml"/>
     <copy tofile="${release.dir}/worldedit.updatr" file="worldedit.updatr"/>
     <replace file="${release.dir}/worldedit.updatr" token="%version%" value="${version}"/>
     <copy tofile="${release.dir}/plugin.yml" file="plugin.yml"/>
diff --git a/config.yml b/config.yml
new file mode 100644
index 000000000..76da28476
--- /dev/null
+++ b/config.yml
@@ -0,0 +1,37 @@
+limits:
+    max-blocks-changed:
+        default: -1
+        maximum: -1
+    max-radius: -1
+    max-super-pickaxe-size: 5
+    max-brush-radius: 5
+    disallowed-blocks: [6, 7, 14, 15, 16, 21, 22, 23, 24, 25, 26, 27, 28, 29, 39, 31, 32, 33, 34, 36, 37, 38, 39, 40, 46, 50, 51, 56, 59, 69, 73, 74, 75, 76, 77, 81, 83]
+use-inventory:
+    enable: false
+    allow-override: true
+logging:
+    log-commands: false
+    file: worldedit.log
+super-pickaxe:
+    drop-items: true
+    many-drop-items: false
+snapshots:
+    directory:
+shell-save-type: 
+no-double-slash: false
+debug: false
+permissions:
+    groups:
+        default:
+            permissions:
+                - /worldeditselect
+        example:
+            permissions:
+                - /worldeditselect
+    users:
+        sk89q:
+            groups:
+                - example
+            permissions:
+                - /reload
+                - /worledit
\ No newline at end of file