diff --git a/Makefile.in b/Makefile.in
index ec8d12071fd..d53494f634b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,7 +91,7 @@ clean-rust:
 
 endif
 
-src/compiler/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger
+src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-trigger
 	$(Q)$(MAKE) clean-rust
 	touch $@
 
@@ -227,7 +227,7 @@ include $(S)mk/clean.mk
 
 .DEFAULT_GOAL := all
 .PHONY:	all
-all: src/compiler/rust-auto-clean-stamp servo package
+all: src/compiler/rust/rust-auto-clean-stamp servo package
 
 # Servo helper libraries
 
diff --git a/src/support/spidermonkey/rust-mozjs b/src/support/spidermonkey/rust-mozjs
index 372622906d1..df2b9ae514b 160000
--- a/src/support/spidermonkey/rust-mozjs
+++ b/src/support/spidermonkey/rust-mozjs
@@ -1 +1 @@
-Subproject commit 372622906d112ae28825be1d5fcd8737cd03ae58
+Subproject commit df2b9ae514ba76c616e7f58d9de0da545512cfe0