diff --git a/.gitmodules b/.gitmodules
index 4c6d7804fd..646261a355 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,7 @@
 [submodule "libmupen64plus/mupen64plus-rsp-cxd4"]
 	path = libmupen64plus/mupen64plus-rsp-cxd4
 	url = https://github.com/TASVideos/mupen64plus-rsp-cxd4.git
+[submodule "waterbox/snes9x"]
+	path = waterbox/snes9x
+	url = ssh://git@github.com/TASVideos/snes9x.git
+	branch = bizsnes
diff --git a/snes9xgit.txt b/snes9xgit.txt
deleted file mode 100644
index 219235b3ff..0000000000
--- a/snes9xgit.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-In order to have snes9x in the right place, clone the git repo:
-
-https://github.com/nattthebear/snes9x
-
-Into a path directly under the location of this file, called:
-
-snes9xgit/
-
diff --git a/waterbox/snes9x b/waterbox/snes9x
new file mode 160000
index 0000000000..737caf908b
--- /dev/null
+++ b/waterbox/snes9x
@@ -0,0 +1 @@
+Subproject commit 737caf908be47b868bf58080f87ce9f3592fce07