diff --git a/.gitmodules b/.gitmodules
index 415f5b1e64b..fe32a049d6c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,4 +43,7 @@
 [submodule "src/rust-hubbub"]
 	path = src/rust-hubbub
 	url = git://github.com/pcwalton/rust-hubbub.git
+[submodule "src/rust-core-foundation"]
+	path = src/rust-core-foundation
+	url = git://github.com/pcwalton/rust-core-foundation.git
 
diff --git a/Makefile.in b/Makefile.in
index a445671efa3..486e17617f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ RUSTLIBS = \
 	-L src/rust-layers \
 	-L src/rust-http-client \
 	-L src/rust-hubbub \
+	-L src/rust-rust-core-foundation \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -50,13 +51,13 @@ LAYERS_DEPS = \
 	src/rust-azure/libazure.dummy
 
 ifeq ($(OSTYPE),darwin)
-    SERVO_DEPS += rust-cocoa
+    SERVO_DEPS += rust-cocoa rust-core-foundation
     # I want the cocoa check to come before the servo check since if cocoa
     # doesn't work neither does servo
-    CHECK_DEPS += check-rust-cocoa
-    CLEAN_DEPS += clean-rust-cocoa
-    AZURE_DEPS += rust-cocoa
-    LAYERS_DEPS += rust-cocoa
+    CHECK_DEPS += check-rust-cocoa check-rust-core-foundation
+    CLEAN_DEPS += clean-rust-cocoa clean-rust-core-foundation
+    AZURE_DEPS += rust-cocoa rust-core-foundation
+    LAYERS_DEPS += rust-cocoa rust-core-foundation
 endif
 
 SERVO_DEPS += \
@@ -127,7 +128,7 @@ reftest: src/reftest/reftest.rs libservo.dummy
 
 .PHONY: mozjs rust-harfbuzz rust-mozjs rust-azure rust-cocoa \
 	rust-stb-image rust-geom rust-opengles rust-glut rust-layers \
-	rust-http-client
+	rust-http-client rust-core-foundation
 
 mozjs: src/mozjs/libjs_static.a
 
@@ -151,6 +152,8 @@ rust-layers: src/rust-layers/librustlayers.dummy
 
 rust-http-client: src/rust-http-client/libhttp_client.dummy
 
+rust-core-foundation: src/rust-core-foundation/librustcorefoundation.dummy
+
 libparserutils: src/libparserutils/libparserutils.dummy
 
 libhubbub: src/libhubbub/libhubbub.dummy
@@ -207,6 +210,9 @@ src/servo-sandbox/servo-sandbox.dummy:
 src/rust-hubbub/librusthubbub.dummy:
 	$(MAKE) -C src/rust-hubbub
 
+src/rust-core-foundation/librustcorefoundation.dummy:
+	$(MAKE) -C src/rust-core-foundation
+
 
 # Testing targets
 
@@ -252,6 +258,9 @@ check-rust-layers: $(LAYERS_DEPS)
 check-rust-http-client:
 	$(MAKE) check -C src/rust-http-client
 
+check-rust-core-foundation:
+	$(MAKE) check -C src/rust-core-foundation
+
 
 # Clean targets
 
@@ -292,6 +301,9 @@ clean-rust-layers:
 clean-rust-http-client:
 	$(MAKE) clean -C src/rust-http-client
 
+clean-rust-core-foundation:
+	$(MAKE) clean -C src/rust-core-foundation
+
 clean-servo:
 	rm -f servo servo-test
 
diff --git a/configure.in b/configure.in
index a5caa2066b6..ccacd837516 100755
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@ mkdir -p src/libparserutils || exit $?
 mkdir -p src/libhubbub || exit $?
 mkdir -p src/servo-sandbox || exit $?
 mkdir -p src/rust-hubbub || exit $?
+mkdir -p src/rust-core-foundation || exit $?
 
 mkdir -p src/test/ref || exit $?
 
@@ -36,3 +37,4 @@ mkdir -p src/test/ref || exit $?
 (cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $?
 (cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $?
 (cd src/rust-hubbub && sh ${SRCDIR}/src/rust-hubbub/configure) || exit $?
+(cd src/rust-core-foundation && sh ${SRCDIR}/src/rust-core-foundation/configure) || exit $?
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
new file mode 160000
index 00000000000..0225d541957
--- /dev/null
+++ b/src/rust-core-foundation
@@ -0,0 +1 @@
+Subproject commit 0225d541957f23c181def64d787bdb4db6156f81
diff --git a/src/servo-sandbox b/src/servo-sandbox
index c1a3cd94ee7..4fc86aceb44 160000
--- a/src/servo-sandbox
+++ b/src/servo-sandbox
@@ -1 +1 @@
-Subproject commit c1a3cd94ee7ea21d27b9a90d1576417dc3d8edbf
+Subproject commit 4fc86aceb448ebb9658664e60e8ffdb1d5e3c989