diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..dc5c4104b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fmp"]
+	path = fmp
+	url = https://github.com/Chicken-Bones/ForgeMultipart.git
diff --git a/build.xml b/build.xml
index ffd782b16..539a81993 100644
--- a/build.xml
+++ b/build.xml
@@ -29,9 +29,6 @@
 		
 		<get src="https://www.dropbox.com/s/qedjhg8gf1fuk8t/CodeChickenLib-dev-latest.jar?dl=1"
 			dest="${dir.mcp}/lib/CCLib-dev.jar"/>
-			
-		<get src="http://files.minecraftforge.net/ForgeMultipart/ForgeMultipart-dev-1.6.4-1.0.0.212.jar"
-			dest="${dir.mcp}/lib/ForgeMultipart-dev.jar"/>
 
 		<copy todir="${dir.mcp}/src/minecraft">
 
diff --git a/fmp b/fmp
new file mode 160000
index 000000000..f3e68b745
--- /dev/null
+++ b/fmp
@@ -0,0 +1 @@
+Subproject commit f3e68b745991262f726565f50dd2173743dc9225