diff --git a/Sponge/build.gradle b/Sponge/build.gradle
index 203cf013c..7acf27887 100644
--- a/Sponge/build.gradle
+++ b/Sponge/build.gradle
@@ -5,18 +5,20 @@ buildscript {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
+        maven {url = "http://repo.minecrell.net/snapshots"}
     }
     dependencies {
+        classpath 'net.minecrell:VanillaGradle:2.0.3-SNAPSHOT'
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecrell.vanilla.server.library'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
     compile project(':Core')
-    compile 'org.spongepowered:spongeapi:4.0.3'
+    compile 'org.spongepowered:spongeapi:4.+'
     compile 'org.mcstats.sponge:metrics:R8-SNAPSHOT'
 }
 
@@ -38,8 +40,8 @@ repositories {
     }
 }
 minecraft {
-    version = "1.8.9-11.15.1.1742"
-    mappings = "snapshot_20160204"
+    version = "1.8.9"
+    mappings = "stable_22"
     runDir = 'run'
 }
 
diff --git a/build.gradle b/build.gradle
index dc4af778e..8ac813bc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 group = 'com.intellectualcrafters'
-version = '3.3.2'
+version = '3.3.3-SNAPSHOT'
 description = """PlotSquared"""
 
 subprojects {