diff --git a/Plugins/BuildFiles/common.xml b/Plugins/BuildFiles/common.xml
index dd9f569e6..13b582c81 100644
--- a/Plugins/BuildFiles/common.xml
+++ b/Plugins/BuildFiles/common.xml
@@ -229,17 +229,27 @@
 		<copy file="../bin/MineKart.jar" todir="../../Testing/MineKart/plugins"/>
 	</target>
 	<target name="NautilusCraftBukkit2" description="NautilusCraftBukkit2">
-		<copy file="../Libraries/craftbukkit_official.jar" tofile="../bin/craftbukkit.jar" overwrite="true"/>
-		<jar jarfile="../bin/craftbukkit.jar" update="true">
+		<mkdir dir="../bin/craftbukkit_temp" />
+		<delete file="../bin/craftbukkit.jar" />
+		<unzip src="../Libraries/craftbukkit_official.jar" dest="../bin/craftbukkit_temp" />
+		<touch datetime="01/31/1981 01:00:00 AM">
+			<fileset dir="../bin/craftbukkit_temp"/>
+		</touch>
+		<copy todir="../bin/craftbukkit_temp" overwrite="true">
 			<fileset dir="../Nautilus.Core.CraftBukkit/bin">
 				<include name="**/*.class"/>
 			</fileset>
+		</copy>
+		
+		<jar jarfile="../bin/craftbukkit.jar">
+			<fileset dir="../bin/craftbukkit_temp" />
 			<manifest>
 				<attribute name="Main-Class" value="org.bukkit.craftbukkit.Main" />
 			</manifest>
 			<zipfileset src="../Libraries/jopt-simple-3.2.jar" />
 		</jar>
 		<copy file="../bin/craftbukkit.jar" todir="../Libraries/"/>
+		<delete dir="../bin/craftbukkit_temp" />
 	</target>
 
     </project>
\ No newline at end of file
diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar
index 484fcec28..4cee24c03 100644
Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ
diff --git a/Plugins/Mineplex.Core.Common/.classpath b/Plugins/Mineplex.Core.Common/.classpath
index b011c8f62..5593c632f 100644
--- a/Plugins/Mineplex.Core.Common/.classpath
+++ b/Plugins/Mineplex.Core.Common/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath
index 89fdee623..11dbd4e6d 100644
--- a/Plugins/Nautilus.Game.Arcade/.classpath
+++ b/Plugins/Nautilus.Game.Arcade/.classpath
@@ -6,8 +6,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.Core"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>