diff --git a/fml/build.xml b/fml/build.xml
index 0e7e74dd7..12e84a82b 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -136,7 +136,7 @@
     <zip destfile="${basedir}/target/${jarname}.zip">
       <fileset dir="${output}" includes="**/*.class" />
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" prefix=""/>
+      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" prefix="/"/>
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
@@ -159,9 +159,24 @@
     <property name="jarname" value="${modname}-src-${version}" />
     <zip destfile="${basedir}/target/${jarname}.zip">
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt" prefix="fml" />
-      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/src/minecraft_server" />
+      <zipfileset dir="${common.src.dir}" includes="**/*.java" excludes="**/Loader.java" prefix="fml/src/minecraft_server" />
       <zipfileset dir="${server.src.dir}" includes="**/*.java" prefix="fml/src/minecraft_server" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
+      <mappedresources>
+        <concat>
+          <fileset dir="${common.src.dir}" includes="cpw/mods/fml/common/Loader.java" />
+          <filterchain>
+            <replacetokens>
+              <token key="MAJOR" value="${version.major}" />
+              <token key="MINOR" value="${version.minor}" />
+              <token key="REV" value="${version.rev}" />
+              <token key="BUILD" value="${version.build}" />
+              <token key="MCVERSION" value="${version.minecraft}" />
+            </replacetokens>
+          </filterchain>
+        </concat>
+        <mergemapper to="fml/cpw/mods/fml/common/Loader.java" />
+      </mappedresources>
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap
deleted file mode 100644
index 3d59c8f9f..000000000
Binary files a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap and /dev/null differ