diff --git a/.gitmodules b/.gitmodules
index 1a8f0ff7a0b..4354efafad7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -62,3 +62,6 @@
 [submodule "src/rust-netsurfcss"]
 	path = src/rust-netsurfcss
 	url = git://github.com/mozilla-servo/rust-netsurfcss.git
+[submodule "src/rust-wapcaplet"]
+	path = src/rust-wapcaplet
+	url = git://github.com/mozilla-servo/rust-wapcaplet.git
diff --git a/configure b/configure
index f2664052464..58e9f3794b7 100755
--- a/configure
+++ b/configure
@@ -344,7 +344,7 @@ step_msg "running submodule autoconf scripts"
 
 (cd ${CFG_SRC_DIR}src/mozjs/js/src && "${CFG_AUTOCONF213}") || exit $?
 
-CFG_SUBMODULES="libwapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss servo-sandbox rust-hubbub sharegl rust-mozjs mozjs"
+CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss servo-sandbox rust-hubbub sharegl rust-mozjs mozjs"
 
 if [ $CFG_OSTYPE = "darwin" ]
 then
diff --git a/mk/sub.mk b/mk/sub.mk
index 5b3861c8bd6..9bca964952d 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -22,7 +22,11 @@ DEPS_rust-hubbub += \
 	libhubbub
 
 DEPS_rust-netsurfcss += \
-	libcss
+	libcss \
+	rust-wapcaplet
+
+DEPS_rust-wapcaplet += \
+	libwapcaplet
 
 CFLAGS_mozjs += \
 	"-I../mozjs/dist/include"
diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss
index 4da616ec41a..5a5ddd54386 160000
--- a/src/rust-netsurfcss
+++ b/src/rust-netsurfcss
@@ -1 +1 @@
-Subproject commit 4da616ec41a9f8ae2a83ae5a21e9383dbf5ed175
+Subproject commit 5a5ddd543864e249683c16328d8a90e0e2bf0024
diff --git a/src/rust-wapcaplet b/src/rust-wapcaplet
new file mode 160000
index 00000000000..d1a2915aad4
--- /dev/null
+++ b/src/rust-wapcaplet
@@ -0,0 +1 @@
+Subproject commit d1a2915aad4317c8f71ab610de13e065e2a31cea