diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java
index 35ee2385d3..9660989000 100644
--- a/src/main/java/net/minecraftforge/common/ForgeVersion.java
+++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java
@@ -31,17 +31,17 @@ import net.minecraftforge.fml.common.versioning.ComparableVersion;
 public class ForgeVersion
 {
     //This number is incremented every time we remove deprecated code/major API changes, never reset
-    public static final int majorVersion    = 11;
+    public static final int majorVersion    = 12;
     //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 15;
+    public static final int minorVersion    = 16;
     //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
-    public static final int revisionVersion = 1;
+    public static final int revisionVersion = 0;
     //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
     public static final int buildVersion    = 0;
     // This is the minecraft version we're building for - used in various places in Forge/FML code
-    public static final String mcVersion = "1.8.9";
+    public static final String mcVersion = "1.9";
     // This is the MCP data version we're using
-    public static final String mcpVersion = "9.19";
+    public static final String mcpVersion = "9.23";
     @SuppressWarnings("unused")
     private static Status status = PENDING;
     @SuppressWarnings("unused")
@@ -239,16 +239,12 @@ public class ForgeVersion
     }
 
     // Gather a list of mods that have opted in to this update system by providing a URL.
-    // Small hack needed to support a interface change until we force a recompile.
     public static Map<ModContainer, URL> gatherMods()
     {
         Map<ModContainer, URL> ret = new HashMap<ModContainer, URL>();
         for (ModContainer mod : Loader.instance().getActiveModList())
         {
-            URL url = null;
-            try {
-                url = mod.getUpdateUrl();
-            } catch (AbstractMethodError abs) { } //TODO: Remove this in 1.8.8+?
+            URL url = mod.getUpdateUrl();
             if (url != null)
                 ret.put(mod, url);
         }
diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java
index 51e3e153cb..157b27d3af 100644
--- a/src/main/java/net/minecraftforge/fml/common/Loader.java
+++ b/src/main/java/net/minecraftforge/fml/common/Loader.java
@@ -113,7 +113,7 @@ import com.google.gson.JsonParser;
 @SuppressWarnings("unused")
 public class Loader
 {
-    public static final String MC_VERSION = "1.8.9";
+    public static final String MC_VERSION = net.minecraftforge.common.ForgeVersion.mcVersion;
     private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
     private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
     /**
@@ -705,7 +705,7 @@ public class Loader
             // before elements are things we are loaded before (so they are our dependants)
             if ("required-before".equals(instruction) || "before".equals(instruction))
             {
-            	dependants.add(VersionParser.parseVersionReference(target));
+                dependants.add(VersionParser.parseVersionReference(target));
             }
             // after elements are things that load before we do (so they are out dependencies)
             else if ("required-after".equals(instruction) || "after".equals(instruction))
@@ -984,7 +984,7 @@ public class Loader
 
     public void fireRemapEvent(Map<ResourceLocation, Integer[]> remapBlocks, Map<ResourceLocation, Integer[]> remapItems, boolean isFreezing)
     {
-	    modController.propogateStateMessage(new FMLModIdMappingEvent(remapBlocks, remapItems, isFreezing));
+        modController.propogateStateMessage(new FMLModIdMappingEvent(remapBlocks, remapItems, isFreezing));
     }
 
     public void runtimeDisableMod(String modId)