diff --git a/.gitmodules b/.gitmodules
index e555117198d..415f5b1e64b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,4 +40,7 @@
 [submodule "src/servo-sandbox"]
 	path = src/servo-sandbox
 	url = git://github.com/pcwalton/servo-sandbox.git
+[submodule "src/rust-hubbub"]
+	path = src/rust-hubbub
+	url = git://github.com/pcwalton/rust-hubbub.git
 
diff --git a/Makefile.in b/Makefile.in
index 52cea4df450..a445671efa3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,7 @@ RUSTLIBS = \
 	-L src/rust-glut \
 	-L src/rust-layers \
 	-L src/rust-http-client \
+	-L src/rust-hubbub \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -72,6 +73,7 @@ SERVO_DEPS += \
 	src/libparserutils/libparserutils.dummy \
 	src/libhubbub/libhubbub.dummy \
 	src/servo-sandbox/servo-sandbox.dummy \
+	src/rust-hubbub/librusthubbub.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -202,6 +204,9 @@ src/libhubbub/libhubbub.dummy:
 src/servo-sandbox/servo-sandbox.dummy:
 	$(MAKE) -C src/servo-sandbox
 
+src/rust-hubbub/librusthubbub.dummy:
+	$(MAKE) -C src/rust-hubbub
+
 
 # Testing targets
 
diff --git a/configure.in b/configure.in
index 2bf50a3e67c..c65db83c24e 100755
--- a/configure.in
+++ b/configure.in
@@ -17,6 +17,7 @@ mkdir -p src/rust-http-client || exit $?
 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/test/ref || exit $?
 
@@ -34,3 +35,4 @@ mkdir -p src/test/ref || exit $?
 (cd src/libparserutils && sh ${SRCDIR}/src/libparserutils/configure) || 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 $?
diff --git a/src/rust-hubbub b/src/rust-hubbub
new file mode 160000
index 00000000000..599b086aa52
--- /dev/null
+++ b/src/rust-hubbub
@@ -0,0 +1 @@
+Subproject commit 599b086aa5219e6d5306939fc306a1ee300f21e5
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
diff --git a/src/servo/content/content_task.rs b/src/servo/content/content_task.rs
index 075febd5538..c7a76e7c433 100644
--- a/src/servo/content/content_task.rs
+++ b/src/servo/content/content_task.rs
@@ -128,9 +128,13 @@ struct Content<C:Compositor> {
             let stream = spawn_html_lexer_task(copy url, self.resource_task);
             let (root, style_port, js_port) = build_dom(self.scope, stream, url, 
                                                         self.resource_task);
+
             let css_rules = style_port.recv();
             let js_scripts = js_port.recv();
 
+            let css_rules = ~[];
+            let js_scripts = ~[];
+
             // Apply the css rules to the dom tree:
             #debug["css_rules: %?", css_rules];