diff --git a/.gitmodules b/.gitmodules
index 39fd3127364..c22262c5813 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -116,3 +116,6 @@
 [submodule "src/test/wpt/web-platform-tests"]
 	path = src/test/wpt/web-platform-tests
 	url = https://github.com/mozilla-servo/web-platform-tests.git
+[submodule "src/support/phf/rust-phf"]
+	path = src/support/phf/rust-phf
+	url = https://github.com/mozilla-servo/rust-phf.git
diff --git a/configure b/configure
index d1ebac3c770..28237a8e4e2 100755
--- a/configure
+++ b/configure
@@ -502,7 +502,8 @@ CFG_SUBMODULES="\
     support/geom/rust-geom \
     support/layers/rust-layers \
     support/opengles/rust-opengles \
-    support/sharegl/sharegl"
+    support/sharegl/sharegl \
+    support/phf/rust-phf"
 
 if [ $CFG_OSTYPE = "apple-darwin" ]
 then
@@ -714,6 +715,9 @@ do
             CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-skia"
             ENABLE_DEBUG="$CFG_ENABLE_DEBUG_SKIA"
             ;;
+        support/phf/rust-phf)
+            ENABLE_DEBUG=""
+            ;;
         *)
             ;;
     esac
diff --git a/src/support/phf/rust-phf b/src/support/phf/rust-phf
new file mode 160000
index 00000000000..8564c2f9b23
--- /dev/null
+++ b/src/support/phf/rust-phf
@@ -0,0 +1 @@
+Subproject commit 8564c2f9b23a3e178f8b233b5c08e546c87d6f74