diff --git a/.gitignore b/.gitignore
index b3fa7ea3ad7..afd7a3c11d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 servo-test
 Makefile
 Servo.app
+build
\ No newline at end of file
diff --git a/Makefile.in b/Makefile.in
index d31a1928a42..eb15cc3bf34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,8 +12,11 @@ ifeq ($(UNAME),Linux)
     OSTYPE=linux
 endif
 
-RUSTFLAGS += -L $(VPATH)/src/rust-azure -L $(VPATH)/src/rust-sdl \
-             -L $(VPATH)/src/rust-cocoa
+RUSTFLAGS += \
+	-L src/rust-azure \
+	-L src/rust-sdl \
+	-L src/rust-cocoa \
+	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
 
@@ -59,13 +62,13 @@ servo-test: $(SERVO_DEPS)
 	$(RUSTC) $(RUSTFLAGS) --test -o $@ $<
 
 src/rust-azure/libazure.dummy:
-	make -C $(VPATH)/src/rust-azure
+	make -C src/rust-azure
 
 src/rust-sdl/libsdl.dummy:
-	make -C $(VPATH)/src/rust-sdl
+	make -C src/rust-sdl
 
 src/rust-cocoa/libcocoa.dummy:
-	make -C $(VPATH)/src/rust-cocoa
+	make -C src/rust-cocoa
 
 check: $(CHECK_DEPS)
 
@@ -74,30 +77,30 @@ check-servo: servo-test
 
 .PHONY: check-azure
 check-azure:
-	make check -C $(VPATH)/src/rust-azure
+	make check -C src/rust-azure
 
 .PHONY: check-sdl
 check-sdl:
-	make check -C $(VPATH)/src/rust-sdl
+	make check -C src/rust-sdl
 
 .PHONY: check-cocoa
 check-cocoa:
-	make check -C $(VPATH)/src/rust-cocoa
+	make check -C src/rust-cocoa
 
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
 .PHONY: clean-azure
 clean-azure:
-	make clean -C $(VPATH)/src/rust-azure
+	make clean -C src/rust-azure
 
 .PHONY: clean-sdl
 clean-sdl:
-	make clean -C $(VPATH)/src/rust-sdl
+	make clean -C src/rust-sdl
 
 .PHONY: clean-cocoa
 clean-cocoa:
-	make clean -C $(VPATH)/src/rust-cocoa
+	make clean -C src/rust-cocoa
 
 .PHONY: clean-servo
 clean-servo:
@@ -111,9 +114,9 @@ package: servo
 	mkdir -p Servo.app/Contents/MacOS/src/rust-azure
 	cp $(VPATH)/Info.plist Servo.app/Contents/
 	cp servo Servo.app/Contents/MacOS/
-	cp $(VPATH)/src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
-	cp $(VPATH)/src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/
-	cp $(VPATH)/src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
+	cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
+	cp src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/
+	cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
 
 else
 
diff --git a/configure b/configure
index 2d7c66cfb62..db616357b4b 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,12 @@
 #!/bin/bash
 
-sed "s/%VPATH%/`dirname $0`/" `dirname $0`/Makefile.in > Makefile
+SRCDIR="$(cd $(dirname $0) && pwd)"
+sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
 
+mkdir -p src/rust-sdl
+mkdir -p src/rust-azure
+mkdir -p src/rust-cocoa
+
+(cd src/rust-sdl && sh ${SRCDIR}/src/rust-sdl/configure)
+(cd src/rust-azure && sh ${SRCDIR}/src/rust-azure/configure)
+(cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure)
diff --git a/src/rust-azure b/src/rust-azure
index 370d322af92..f1668780f29 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 370d322af925fce23a2797c67499268d1cb5385e
+Subproject commit f1668780f2955fe935d1bce42e51677893bd34c8
diff --git a/src/rust-cocoa b/src/rust-cocoa
index ee0008f3e3a..cff75030841 160000
--- a/src/rust-cocoa
+++ b/src/rust-cocoa
@@ -1 +1 @@
-Subproject commit ee0008f3e3adc815d45130d79d7d5d6d64d3a40b
+Subproject commit cff7503084162cc68598e059fa46ec634bc994fe
diff --git a/src/rust-sdl b/src/rust-sdl
index dffae144b0f..e0e4b019bdd 160000
--- a/src/rust-sdl
+++ b/src/rust-sdl
@@ -1 +1 @@
-Subproject commit dffae144b0fa38c22b14b70e75d2767ccdfeca3f
+Subproject commit e0e4b019bdd1a1f15d8861e3255127cc8f030cd7