diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0b3c83973..4446678d5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,23 @@
+2.3:
+- Blocks should now be set and removed correctly so that they don't
+    drop items.
+- /fixwater and /fixlava should no longer cross solely diagonally connected
+    pools.
+- Fixed //smooth lifting water upwards.
+- Added //shift to move the selection.
+- Added //flip to flip the clipboard.
+- ; instead of | can be used when specifying extra tile entity data
+    for blocks that support them.
+- Items are now dropped by the super pickaxe (configurable).
+- The info tool is governed by the permission /infotool and the tree tool
+    is now goverened by the /treetool permission.
+- New info tool (//tool info) that tells you information about the block
+    that you right click with a pickaxe on, including the type of mob
+    spawned by a mob spawner.
+- Mob spawners are now supported for all operations. To specify a mob type,
+    use syntax like //set mobspawner;Pig or //set mobspawner|Pig
+- Added a catch for the IOException now thrown by recent versions of hMod.
+
 2.2.1:
 - Fixed compatibility with server v0.2.5.
 
diff --git a/README.txt b/README.txt
index 4256937d2..54fb957a1 100644
--- a/README.txt
+++ b/README.txt
@@ -11,4 +11,6 @@ undoing and redoing operations, loading and saving .schematic
 files, and much more.
 
 For usage help, see:
-http://github.com/sk89q/worldedit/wiki/Usage
\ No newline at end of file
+http://github.com/sk89q/worldedit/wiki/Usage
+
+Thanks to grum for writing the terrain smoother.
\ No newline at end of file
diff --git a/manifest.mf b/manifest.mf
index 736f7435c..3226f2133 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Class-Path: jnbt.jar truezip.jar ant.jar
-WorldEdit-Version: 2.2.1
\ No newline at end of file
+WorldEdit-Version: 2.3
\ No newline at end of file
diff --git a/worldedit.properties b/worldedit.properties
new file mode 100644
index 000000000..e498302cb
--- /dev/null
+++ b/worldedit.properties
@@ -0,0 +1,54 @@
+#
+# WorldEdit configuration
+# To reload WorldEdit's configuration, use /reloadplugin WorldEdit, although
+# be aware that it will also clear your history and selection.
+#
+
+# Item to use for WorldEdit's "wand" that lets you select points. By default
+# it is the wood axe but you can change it below. Using //wand will give
+# you the wand item (if you have permission to use the command).
+wand-item=271
+
+# Limit the maximum number of blocks that can be changed in one operation.
+# Use -1 to disable.
+max-blocks-changed=-1
+
+# Limit the maximum radius for various commands that use a size or radius
+# parameter. Use -1 to disable.
+max-radius=-1
+
+# Maximum size that one of the alternate area super pickaxe modes can use.
+max-super-pickaxe-size=5
+
+# Add commands to hMod's help system.
+register-help=true
+
+# Print used commands to console.
+log-commands=false
+
+# Log commands used to file. The above must be enabled.
+log-file=
+
+# Drop items when the super pickaxe is used.
+super-pickaxe-drop-items=true
+
+# Drop items when one of the area super pickaxe modes are used. Note that
+# this may drop an excessive number of blocks if turned on.
+super-pickaxe-many-drop-items=false
+
+# List of blocks that can be set with WorldEdit. There are ways to bypass
+# this list (such as by stacking an existing block) as this list is only
+# to prevent mistakes. For example, you should never set an area with
+# cacti (it results in severe lag) or torches (results in expensive
+# lighting recalculations).
+allowed-blocks=0,1,2,3,4,5,7,8,9,10,11,12,13,14,15,16,17,18,19,20,35,41,42,43,44,45,47,48,49,52,53,54,56,57,58,60,61,62,67,73,78,79,80,82,85,86,87,88,89,91
+
+# Directory to load backups from for //restore. See documentation.
+snapshots-dir=
+
+# Used for /delchunks. See documentation.
+shell-save-type=
+
+# Prints how long each command takes for completion. This is for debugging
+# and it is not particularly useful to most people.
+debug-profile=false
\ No newline at end of file