diff --git a/Makefile.in b/Makefile.in
index 19a192f8d25..9fa4836d875 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -328,7 +328,7 @@ servo:	$(DEPS_servo)
 else
 servo:  $(DEPS_servo)
 	@$(call E, compile: $@)
-	$(Q)$(RUSTC) $(RFLAGS_servo) -o $@ $< --lib
+	$(Q)$(RUSTC) $(RFLAGS_servo) -o -Z gen-crate-map $@ $< --lib
 endif
 
 # Darwin app packaging
diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc
index 6b1bbe37302..deb8f8c4b38 100755
--- a/src/components/main/servo.rc
+++ b/src/components/main/servo.rc
@@ -20,6 +20,8 @@ extern mod js;
 extern mod layers;
 extern mod opengles;
 extern mod png;
+#[cfg(target_os="android")]
+extern mod rustuv;
 extern mod script;
 extern mod servo_net = "net";
 extern mod servo_msg = "msg";