diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..a0c3ef7ad6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "fuzzers/qemufuzzer/qemu-fuzz"]
+	path = fuzzers/qemufuzzer/qemu-fuzz
+	url = git@github.com:AFLplusplus/qemu-fuzz.git
diff --git a/fuzzers/qemufuzzer/test.sh b/fuzzers/qemufuzzer/build.sh
similarity index 78%
rename from fuzzers/qemufuzzer/test.sh
rename to fuzzers/qemufuzzer/build.sh
index bb7c64cbdb..f2e5dddf0e 100755
--- a/fuzzers/qemufuzzer/test.sh
+++ b/fuzzers/qemufuzzer/build.sh
@@ -2,8 +2,9 @@
 
 cargo build --release
 
-cd qemu
-git pull
+cd qemu-fuzz
+
+git submodule update
 
 ./build_qemu_fuzz.sh ../target/release/libqemufuzzer.a
 
diff --git a/fuzzers/qemufuzzer/qemu-fuzz b/fuzzers/qemufuzzer/qemu-fuzz
new file mode 160000
index 0000000000..6f719f6aed
--- /dev/null
+++ b/fuzzers/qemufuzzer/qemu-fuzz
@@ -0,0 +1 @@
+Subproject commit 6f719f6aedc9c199d7b99ef42c532a9a20605ff3