diff --git a/.gitignore b/.gitignore
index 41c5b3cdc0..f61f6b333c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ PaperSpigot-Server
 PaperSpigot-API
 Bukkit
 CraftBukkit
+Paperclip
+Paperclip.jar
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 4fbc64d512..42c147acb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "BuildData"]
 	path = BuildData
 	url = https://hub.spigotmc.org/stash/scm/spigot/builddata.git
+[submodule "Paperclip"]
+	path = Paperclip
+	url = https://github.com/PaperSpigot/Paperclip.git
diff --git a/Paperclip b/Paperclip
new file mode 160000
index 0000000000..cf7f7c312e
--- /dev/null
+++ b/Paperclip
@@ -0,0 +1 @@
+Subproject commit cf7f7c312ea41d06b57912f7bd9e830cacb64df3
diff --git a/build.sh b/build.sh
index d138a58891..a658f39d99 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-git submodule update --init && ./remap.sh && ./decompile.sh && ./init.sh && ./newApplyPatches.sh && mvn clean install
+git submodule update --init && ./remap.sh && ./decompile.sh && ./init.sh && ./newApplyPatches.sh && mvn clean install && ./paperclip.sh
diff --git a/paperclip.sh b/paperclip.sh
new file mode 100755
index 0000000000..5cf1433467
--- /dev/null
+++ b/paperclip.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+cp ./PaperSpigot-Server/target/paperspigot*.jar ./Paperclip/paperspigot-1.8.8.jar
+cp ./work/1.8.8/1.8.8.jar ./Paperclip/minecraft_server.1.8.8.jar
+cd ./Paperclip
+mvn clean package
+cd ..
+cp ./Paperclip/target/paperclip*.jar ./Paperclip.jar
+
+echo ""
+echo ""
+echo ""
+echo "Build success!"
+echo "Copied final jar to $(pwd)/Paperclip.jar"
\ No newline at end of file