diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ebb50d48..cadf5ccc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+5.5.1:
+- Fixed attacking with arrows from non-PVP to PVP areas
+- Compatibility with Bukkit 1.1-R5
+- Removed broken suppress-tick-sync-warnings config option. See bukkit.yml's setings.warn-on-overload option instead.
+- Add region and 'can build' information to CommandBook's /whois
+
+Contributions thanks to: NolanSyKinsley
+
 5.5:
 - Removed WorldEdit.jar from the classpath to stop conflicts with Bukkit's plugin loader
 - Now using Bukkit's tagged logging
diff --git a/pom.xml b/pom.xml
index d5694c75..d9c47729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sk89q</groupId>
   <artifactId>worldguard</artifactId>
-  <version>5.6-SNAPSHOT</version>
+  <version>5.5.2-SNAPSHOT</version>
   <name>WorldGuard</name>
   <description>WorldGuard protects your Minecraft servers</description>
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.sk89q</groupId>
       <artifactId>worldedit</artifactId>
-      <version>5.3-SNAPSHOT</version>
+      <version>5.2</version>
     </dependency>
     
     <!-- Bukkit -->
@@ -160,7 +160,7 @@
       <!-- Assembly -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>2.2-beta-2</version>
         <configuration>
           <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
         </configuration>
diff --git a/src/main/assembly/default.xml b/src/main/assembly/default.xml
index bc0f473f..70d0fa94 100644
--- a/src/main/assembly/default.xml
+++ b/src/main/assembly/default.xml
@@ -3,7 +3,6 @@
   xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>default</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>tar.gz</format>
@@ -30,6 +29,7 @@
         <include>NOTICE.txt</include>
         <include>CHANGELOG.txt</include>
         <include>blacklist_table.sql</include>
+        <include>region_storage.sql</include>
       </includes>
     </fileSet>
   </fileSets>