diff --git a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
index 373df14f61..aed6afeae5 100644
--- a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
+++ b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
@@ -219,7 +219,6 @@ public class FMLHandshakeMessages
         }
 
         public static S2CRegistry decode(final PacketBuffer buffer) {
-System.out.println("Readable: " + buffer.readableBytes());
             ResourceLocation name = buffer.readResourceLocation();
             ForgeRegistry.Snapshot snapshot = null;
             if (buffer.readBoolean())
diff --git a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java
index b535b43c01..5d085b44de 100644
--- a/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java
+++ b/src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java
@@ -71,7 +71,15 @@ public abstract class FMLUserdevLaunchProvider extends FMLCommonLaunchHandler {
         final String fjpath = fjroot.toString();
         LOGGER.debug(CORE, "Injecting forge as mod {} from maven path {}", userdevVersion, fjpath);
         mavenRoots.add(fjpath);
-        mods.add(forgeGroup+":forge:"+userdevVersion);
+
+        String classifier = "";
+        if (forgeJar.getFileName().endsWith(".jar")) {
+            if (!("forge-" + userdevVersion + ".jar").equals(forgeJar.getFileName().toString())) {
+                String suffix = forgeJar.getFileName().toString().substring(userdevVersion.length() + 7); //"forge-" + version + "-"
+                suffix = suffix.substring(0, suffix.length() - 4); // Remove ".jar"
+            }
+        }
+        mods.add(forgeGroup+":forge:"+userdevVersion + classifier);
 
         try {
             final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources("META-INF/mods.toml");