diff --git a/.gitignore b/.gitignore
index f78e00fb..f78426c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 zig-cache
 zig-out
 /vendor/lexbor/
+/vendor/netsurf/build/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 26181de6..622ee626 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,18 @@
 [submodule "vendor/lexbor-src"]
 	path = vendor/lexbor-src
 	url = https://github.com/lexbor/lexbor
+[submodule "vendor/netsurf/libwapcaplet"]
+	path = vendor/netsurf/libwapcaplet
+	url = https://source.netsurf-browser.org/libwapcaplet.git
+[submodule "vendor/netsurf/libparserutils"]
+	path = vendor/netsurf/libparserutils
+	url = https://source.netsurf-browser.org/libparserutils.git
+[submodule "vendor/netsurf/libdom"]
+	path = vendor/netsurf/libdom
+	url = https://source.netsurf-browser.org/libdom.git
+[submodule "vendor/netsurf/share/netsurf-buildsystem"]
+	path = vendor/netsurf/share/netsurf-buildsystem
+	url = https://source.netsurf-browser.org/buildsystem.git
+[submodule "vendor/netsurf/libhubbub"]
+	path = vendor/netsurf/libhubbub
+	url = https://source.netsurf-browser.org/libhubbub.git
diff --git a/Makefile b/Makefile
index 04e8fe28..077b5205 100644
--- a/Makefile
+++ b/Makefile
@@ -75,9 +75,7 @@ endif
 install-netsurf:
 	@printf "\e[36mInstalling NetSurf...\e[0m\n" && \
 	ls $(ICONV) 1> /dev/null || (printf "\e[33mERROR: you need to install libiconv in your system (on MacOS on with Homebrew)\e[0m\n"; exit 1;) && \
-	mkdir -p vendor/netfurf && \
 	mkdir -p vendor/netfurf/build && \
-	mkdir -p vendor/netfurf/netsurf-buildsystem && \
 	export PREFIX=$(BC_NS) && \
 	export LDFLAGS="-L$(ICONV)/lib" && \
 	export CFLAGS="-I/$(ICONV)/include -I$(BC_NS)/libparserutils/include -I$(BC_NS)/libhubbub/include -I$(BC_NS)/libwapcaplet/include" && \
@@ -95,7 +93,7 @@ install-netsurf:
 	BUILDDIR=$(BC_NS)/build/libdom make 2> /dev/null && \
 	printf "\e[33mRunning libdom example...\e[0m\n" && \
 	cd include/dom && \
-	rm bindings && \
+	rm -f bindings || true && \
 	ln -s ../../bindings bindings && \
 	cd ../../examples && \
 	rm -f a.out || true && \
diff --git a/vendor/netsurf/libdom b/vendor/netsurf/libdom
new file mode 160000
index 00000000..176bab60
--- /dev/null
+++ b/vendor/netsurf/libdom
@@ -0,0 +1 @@
+Subproject commit 176bab60eb10beb68fbbb1a6185c68eeda2a6e95
diff --git a/vendor/netsurf/libhubbub b/vendor/netsurf/libhubbub
new file mode 160000
index 00000000..873ed6e2
--- /dev/null
+++ b/vendor/netsurf/libhubbub
@@ -0,0 +1 @@
+Subproject commit 873ed6e236f7669afd3ef44259c34addc6dc95b6
diff --git a/vendor/netsurf/libparserutils b/vendor/netsurf/libparserutils
new file mode 160000
index 00000000..96cdd0ff
--- /dev/null
+++ b/vendor/netsurf/libparserutils
@@ -0,0 +1 @@
+Subproject commit 96cdd0ff114299f520e76538ab8fde39358b87f9
diff --git a/vendor/netsurf/libwapcaplet b/vendor/netsurf/libwapcaplet
new file mode 160000
index 00000000..b5e42b12
--- /dev/null
+++ b/vendor/netsurf/libwapcaplet
@@ -0,0 +1 @@
+Subproject commit b5e42b12211a92339b0b62cb90f1a86a397e146e
diff --git a/vendor/netsurf/share/netsurf-buildsystem b/vendor/netsurf/share/netsurf-buildsystem
new file mode 160000
index 00000000..b4ba781f
--- /dev/null
+++ b/vendor/netsurf/share/netsurf-buildsystem
@@ -0,0 +1 @@
+Subproject commit b4ba781fe22f356d7c53b1674dff91323af61458