diff --git a/pom.xml b/pom.xml
index dea947474..a4bfe0e46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <dependency> <!-- NMS blocks -->
       <groupId>org.bukkit</groupId>
       <artifactId>craftbukkit</artifactId>
-      <version>1.5-R0.1-SNAPSHOT</version>
+      <version>1.5.1-R0.1-SNAPSHOT</version>
       <scope>compile</scope>
       <type>jar</type>
       <optional>true</optional>
@@ -138,13 +138,7 @@
       <scope>test</scope>
       <type>jar</type>
     </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
+
   </dependencies>
   
   <build>
diff --git a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
index dee9a7ee0..d064b7af6 100644
--- a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
+++ b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
@@ -25,23 +25,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import net.minecraft.server.v1_5_R1.NBTBase;
-import net.minecraft.server.v1_5_R1.NBTTagByte;
-import net.minecraft.server.v1_5_R1.NBTTagByteArray;
-import net.minecraft.server.v1_5_R1.NBTTagCompound;
-import net.minecraft.server.v1_5_R1.NBTTagDouble;
-import net.minecraft.server.v1_5_R1.NBTTagEnd;
-import net.minecraft.server.v1_5_R1.NBTTagFloat;
-import net.minecraft.server.v1_5_R1.NBTTagInt;
-import net.minecraft.server.v1_5_R1.NBTTagIntArray;
-import net.minecraft.server.v1_5_R1.NBTTagList;
-import net.minecraft.server.v1_5_R1.NBTTagLong;
-import net.minecraft.server.v1_5_R1.NBTTagShort;
-import net.minecraft.server.v1_5_R1.NBTTagString;
-import net.minecraft.server.v1_5_R1.TileEntity;
+import net.minecraft.server.v1_5_R2.NBTBase;
+import net.minecraft.server.v1_5_R2.NBTTagByte;
+import net.minecraft.server.v1_5_R2.NBTTagByteArray;
+import net.minecraft.server.v1_5_R2.NBTTagCompound;
+import net.minecraft.server.v1_5_R2.NBTTagDouble;
+import net.minecraft.server.v1_5_R2.NBTTagEnd;
+import net.minecraft.server.v1_5_R2.NBTTagFloat;
+import net.minecraft.server.v1_5_R2.NBTTagInt;
+import net.minecraft.server.v1_5_R2.NBTTagIntArray;
+import net.minecraft.server.v1_5_R2.NBTTagList;
+import net.minecraft.server.v1_5_R2.NBTTagLong;
+import net.minecraft.server.v1_5_R2.NBTTagShort;
+import net.minecraft.server.v1_5_R2.NBTTagString;
+import net.minecraft.server.v1_5_R2.TileEntity;
 
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
 
 import com.sk89q.jnbt.ByteArrayTag;
 import com.sk89q.jnbt.ByteTag;
@@ -81,7 +81,7 @@ public class DefaultNmsBlock extends NmsBlock {
     static {
         Field field;
         try {
-            field = net.minecraft.server.v1_5_R1.Block.class.getDeclaredField("isTileEntity");
+            field = net.minecraft.server.v1_5_R2.Block.class.getDeclaredField("isTileEntity");
             field.setAccessible(true);
         } catch (NoSuchFieldException e) {
             // logger.severe("Could not find NMS block tile entity field!");
@@ -269,7 +269,7 @@ public class DefaultNmsBlock extends NmsBlock {
     }
 
     public static boolean hasTileEntity(int type) {
-        net.minecraft.server.v1_5_R1.Block nmsBlock = getNmsBlock(type);
+        net.minecraft.server.v1_5_R2.Block nmsBlock = getNmsBlock(type);
         if (nmsBlock == null) {
             return false;
         }
@@ -281,11 +281,11 @@ public class DefaultNmsBlock extends NmsBlock {
         }
     }
 
-    public static net.minecraft.server.v1_5_R1.Block getNmsBlock(int type) {
-        if (type < 0 || type >= net.minecraft.server.v1_5_R1.Block.byId.length) {
+    public static net.minecraft.server.v1_5_R2.Block getNmsBlock(int type) {
+        if (type < 0 || type >= net.minecraft.server.v1_5_R2.Block.byId.length) {
             return null;
         }
-        return net.minecraft.server.v1_5_R1.Block.byId[type];
+        return net.minecraft.server.v1_5_R2.Block.byId[type];
     }
 
     /**
@@ -439,7 +439,7 @@ public class DefaultNmsBlock extends NmsBlock {
     }
 
     public static boolean isValidBlockType(int type) throws NoClassDefFoundError {
-        return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R1.Block.byId.length
-                && net.minecraft.server.v1_5_R1.Block.byId[type] != null);
+        return type == 0 || (type >= 1 && type < net.minecraft.server.v1_5_R2.Block.byId.length
+                && net.minecraft.server.v1_5_R2.Block.byId[type] != null);
     }
 }
diff --git a/src/main/resources/nmsblocks/CBXNmsBlock_15.class b/src/main/resources/nmsblocks/CBXNmsBlock_15.class
new file mode 100644
index 000000000..68781e198
Binary files /dev/null and b/src/main/resources/nmsblocks/CBXNmsBlock_15.class differ