diff --git a/Makefile.in b/Makefile.in
index cfd3caddd77..a50a66f1ae1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,11 +93,11 @@ $(S)config.stamp : $(S)configure $(S)Makefile.in
 ifneq ($(CFG_LOCAL_RUSTC),1)
 $(CFG_RUSTC):
 	@$(call E, building rustc)
-	$(Q)$(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" CC=gcc CXX=g++ LD=ld AR=ar
+	$(Q)CFG_RUSTC_FLAGS= CFG_ENABLE_DEBUG= RUSTFLAGS= $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CC=gcc CXX=g++ LD=ld AR=ar
 
 clean-rust:
 	@$(call E, cleaning rustc)
-	$(Q)$(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CFG_RUSTC_FLAGS="" RUSTFLAGS="" clean
+	$(Q)CFG_RUSTC_FLAGS= CFG_ENABLE_DEBUG= RUSTFLAGS= $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" clean
 
 else
 $(CFG_RUSTC):
diff --git a/configure b/configure
index 7ed1f2d00c4..8747cb6f3d4 100755
--- a/configure
+++ b/configure
@@ -605,7 +605,7 @@ done
 if [ ${do_reconfigure} -ne 0 ]
 then
     cd ${CFG_BUILD_DIR}src/compiler/rust
-    RUST_CONFIGURE_ARGS=""
+    RUST_CONFIGURE_ARGS="--enable-debug"
     if [ $CFG_OSTYPE = "linux-androideabi" ]; then
         RUST_CONFIGURE_ARGS="--target-triples=arm-linux-androideabi --android-cross-path=${CFG_ANDROID_CROSS_PATH}"
     fi
diff --git a/mk/clean.mk b/mk/clean.mk
index 2b707718b2a..ae995ef413e 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -27,23 +27,23 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
 
 clean-util:
 	@$(call E, "cleaning util")
-	$(Q)cd $(B)/src/components/util/ && rm -rf libutil*.dylib libutil*.so $(DONE_util)
+	$(Q)cd $(B)/src/components/util/ && rm -rf libutil*.dylib libutil*.dSYM libutil*.so $(DONE_util)
 
 clean-msg:
 	@$(call E, "cleaning msg")
-	$(Q)cd $(B)/src/components/msg/ && rm -rf libmsg*.dylib libmsg*.so $(DONE_msg)
+	$(Q)cd $(B)/src/components/msg/ && rm -rf libmsg*.dylib libmsg*.dSYM libmsg*.so $(DONE_msg)
 
 clean-net:
 	@$(call E, "cleaning net")
-	$(Q)cd $(B)/src/components/net/ && rm -rf libnet*.dylib libnet*.so $(DONE_net)
+	$(Q)cd $(B)/src/components/net/ && rm -rf libnet*.dylib libnet*.dSYM libnet*.so $(DONE_net)
 
 clean-gfx:
 	@$(call E, "cleaning gfx")
-	$(Q)cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib libgfx*.so $(DONE_gfx)
+	$(Q)cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib libgfx*.dSYM libgfx*.so $(DONE_gfx)
 
 clean-script:
 	@$(call E, "cleaning script")
-	$(Q)cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.so $(DONE_script)
+	$(Q)cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.dSYM libscript*.so $(DONE_script)
 
 clean-servo: clean-gfx clean-util clean-net clean-script clean-msg
 	@$(call E, "cleaning servo")
diff --git a/mk/sub.mk b/mk/sub.mk
index 266295d519a..59effff424b 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -45,33 +45,40 @@ DEPS_rust-azure += \
 	glfw-rs \
 	glfw \
 	skia \
+	rust \
 	$(NULL)
 
 DEPS_glfw-rs += \
 	glfw \
+	rust \
 	$(NULL)
 
 DEPS_rust-layers += \
 	rust-geom \
 	rust-opengles \
+	rust \
 	$(NULL)
 
 DEPS_sharegl += \
 	rust-geom \
 	rust-opengles \
+	rust \
 	$(NULL)
 
 DEPS_rust-hubbub += \
 	libhubbub \
+	rust \
 	$(NULL)
 
 DEPS_rust-netsurfcss += \
 	libcss \
 	rust-wapcaplet \
+	rust \
 	$(NULL)
 
 DEPS_rust-wapcaplet += \
 	libwapcaplet \
+	rust \
 	$(NULL)
 
 CFLAGS_rust-wapcaplet += \
@@ -81,10 +88,12 @@ CFLAGS_rust-wapcaplet += \
 DEPS_rust-css += \
 	rust-netsurfcss \
 	rust-wapcaplet \
+	rust \
 	$(NULL)
 
 DEPS_rust-mozjs += \
 	mozjs \
+	rust \
 	$(NULL)
 
 CFLAGS_rust-mozjs += \
@@ -103,29 +112,35 @@ DEPS_rust-azure += \
 	rust-core-text \
 	rust-core-foundation \
 	rust-cocoa \
+	rust \
 	$(NULL)
 
 DEPS_rust-io-surface += \
 	rust-core-foundation \
+	rust \
 	$(NULL)
 
 DEPS_rust-alert += \
 	rust-core-foundation \
 	rust-cocoa \
+	rust \
 	$(NULL)
 
 DEPS_sharegl += \
 	rust-core-foundation \
 	rust-io-surface \
+	rust \
 	$(NULL)
 
 DEPS_rust-core-graphics += \
 	rust-core-foundation \
+	rust \
 	$(NULL)
 
 DEPS_rust-core-text += \
 	rust-core-foundation \
 	rust-core-graphics \
+	rust \
 	$(NULL)
 
 DEPS_rust-layers += \
@@ -133,16 +148,22 @@ DEPS_rust-layers += \
 	rust-core-graphics \
 	rust-core-text \
 	rust-cocoa \
+	rust \
 	$(NULL)
 
 endif
 
+DEPS_nss += \
+	nspr \
+	$(NULL)
+
 ifeq ($(CFG_OSTYPE),unknown-linux-gnu)
 
 DEPS_rust-azure += \
 	rust-freetype \
 	rust-fontconfig \
 	rust-xlib \
+	rust \
 	$(NULL)
 
 # See note at top of file
@@ -150,6 +171,7 @@ DEPS_rust-layers += \
 	rust-freetype \
 	rust-fontconfig \
 	rust-xlib \
+	rust \
 	$(NULL)
 endif
 
@@ -160,21 +182,25 @@ DEPS_rust-azure += \
 	fontconfig \
 	libfreetype2 \
 	libexpat \
+	rust \
 	$(NULL)
 
 # See note at top of file
 DEPS_rust-layers += \
 	rust-freetype \
 	rust-fontconfig \
+	rust \
 	$(NULL)
 
 DEPS_rust-fontconfig += \
 	fontconfig \
 	rust-freetype \
+	rust \
 	$(NULL)
 
 DEPS_rust-freetype += \
 	libfreetype2 \
+	rust \
 	$(NULL)
 
 DEPS_fontconfig += \