diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6485646
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pvbemu"]
+	path = pvbemu
+	url = https://git.virtual-boy.com/PVB/pvbemu.git
diff --git a/makefile b/makefile
index 3719db8..5bb945a 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 build:
 	@mkdir -p build
-	@gcc main.c cmdbuf.c hex.c request.c response.c server.c ../vbtest/vb.c \
-	-I include -I ../vbtest \
+	@gcc main.c cmdbuf.c hex.c request.c response.c server.c pvbemu/core/vb.c \
+	-I include -I pvbemu/core \
 	-Werror -std=c90 -Wall -Wextra -Wpedantic \
 	-Wno-unused-parameter -Wno-unused-function \
 	-D _POSIX_C_SOURCE=199309L \
diff --git a/pvbemu b/pvbemu
new file mode 160000
index 0000000..d4ae5f3
--- /dev/null
+++ b/pvbemu
@@ -0,0 +1 @@
+Subproject commit d4ae5f3909fa8f372ff70d11236cb38e4bd43732