diff --git a/.gitmodules b/.gitmodules
index 45eb26c..f97a3c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "Spigot-API"]
 	path = Spigot-API
 	url = https://git.trueog.net/trueog/Spigot-API
+[submodule "Pufferfish"]
+	path = Pufferfish
+	url = https://git.trueog.net/trueog/Pufferfish
diff --git a/Pufferfish b/Pufferfish
new file mode 160000
index 0000000..f7f7d26
--- /dev/null
+++ b/Pufferfish
@@ -0,0 +1 @@
+Subproject commit f7f7d264454d5718e35addd0d21acaa75177ae99