diff --git a/fml/build.xml b/fml/build.xml
index 0bc86d1cf7..7f4eff29bd 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -147,7 +147,7 @@
 
     <mkdir dir="${basedir}/target" />
     <path id="server.classpath">
-      <pathelement path="${mcp.home}/jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/net/minecraft/launchwrapper/1.8/launchwrapper-1.8.jar"/>
       <pathelement path="${mcp.home}/jars/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar"/>
       <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
       <pathelement path="${mcp.home}/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip
index f98870eb10..3443e185f5 100644
Binary files a/fml/eclipse-workspace-dev.zip and b/fml/eclipse-workspace-dev.zip differ
diff --git a/fml/install/eclipse/Minecraft/.classpath b/fml/install/eclipse/Minecraft/.classpath
index 1c4579fa38..888245765a 100644
--- a/fml/install/eclipse/Minecraft/.classpath
+++ b/fml/install/eclipse/Minecraft/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar" sourcepath="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+	<classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.8/launchwrapper-1.8.jar"/>
 	<classpathentry kind="lib" path="jars/versions/1.6.4/1.6.4.jar">
 		<attributes>
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/versions/1.6.4/1.6.4-natives"/>
diff --git a/fml/jsons/1.6.4-dev.json b/fml/jsons/1.6.4-dev.json
index 2d2ebf2a02..5b8e96fc92 100644
--- a/fml/jsons/1.6.4-dev.json
+++ b/fml/jsons/1.6.4-dev.json
@@ -8,7 +8,7 @@
   "minimumLauncherVersion": 4,
   "libraries": [
     {
-      "name": "net.minecraft:launchwrapper:1.7",
+      "name": "net.minecraft:launchwrapper:1.8",
       "comment" : "Important for FML, we add this"
     },
     {
diff --git a/fml/jsons/1.6.4-rel.json b/fml/jsons/1.6.4-rel.json
index c9e524c34a..3cb673c679 100644
--- a/fml/jsons/1.6.4-rel.json
+++ b/fml/jsons/1.6.4-rel.json
@@ -24,7 +24,7 @@
         "url": "http://files.minecraftforge.net/maven/"
       },
       {
-        "name": "net.minecraft:launchwrapper:1.7",
+        "name": "net.minecraft:launchwrapper:1.8",
         "serverreq":true
       },
       {