diff --git a/.gitmodules b/.gitmodules
index aea348a0a8b..a2cb119f375 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = git://github.com/brson/rust-mozjs.git
 [submodule "src/harfbuzz"]
 	path = src/harfbuzz
-	url = git://anongit.freedesktop.org/harfbuzz.git
+	url = git://github.com/brson/harfbuzz-servo.git
 [submodule "src/ragel"]
 	path = src/ragel
 	url = git://github.com/brson/ragel-dist.git
diff --git a/Makefile.in b/Makefile.in
index c58b2a640db..f1cb1e69ade 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ RUSTC?=rustc
 RUSTFLAGS?=
 
 UNAME=$(shell uname)
+BUILD_DIR=$(shell pwd)
 
 ifeq ($(UNAME),Darwin)
     OSTYPE=darwin
@@ -37,7 +38,7 @@ ifeq ($(OSTYPE),darwin)
 endif
 
 SERVO_DEPS += \
-	src/ragel/ragel/ragel \
+	src/harfbuzz/src/libharfbuzz.la \
 	src/rust-mozjs/libmozjs.dummy \
 	src/rust-azure/libazure.dummy \
 	src/rust-sdl/libsdl.dummy \
@@ -52,6 +53,7 @@ CHECK_DEPS += \
 
 CLEAN_DEPS += \
 	clean-ragel \
+	clean-harfbuzz \
 	clean-rust-mozjs \
 	clean-rust-sdl \
 	clean-rust-azure \
@@ -70,6 +72,9 @@ servo-test: $(SERVO_DEPS)
 src/ragel/ragel/ragel:
 	$(MAKE) -C src/ragel
 
+src/harfbuzz/src/libharfbuzz.la: src/ragel/ragel/ragel
+	$(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel
+
 src/mozjs/libjs_static.a:
 	$(MAKE) -C src/mozjs
 
diff --git a/README.md b/README.md
index c5d44f8c790..a3cb5a0cf74 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ I currently build on OS X and Linux.
 
 On OS X:
 
+    brew install https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb
     brew install sdl cairo
 
 On Debian-based Linuxes:
diff --git a/autogen.sh b/autogen.sh
index baec9f6833d..5a8f5bac0aa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,14 +4,19 @@
 
 if [ ! -z `which autoconf213` ]
 then
-    AUTOCONF=autoconf213
+    AUTOCONF213=autoconf213
 fi
 
 if [ ! -z `which autoconf2.13` ]
 then
-    AUTOCONF=autoconf2.13
+    AUTOCONF213=autoconf2.13
 fi
 
-(cd src/mozjs/js/src && $AUTOCONF)
+if [ -z "$AUTOCONF213" ]
+then
+    echo "I need autoconf 2.13"
+fi
+
+(cd src/mozjs/js/src && $AUTOCONF213) || exit $?
 
 cp -f configure.in configure
diff --git a/configure.in b/configure.in
index 03558d3a86e..d385f0f03ed 100755
--- a/configure.in
+++ b/configure.in
@@ -3,16 +3,18 @@
 SRCDIR="$(cd $(dirname $0) && pwd)"
 sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
 
-mkdir -p src/ragel
-mkdir -p src/mozjs
-mkdir -p src/rust-mozjs
-mkdir -p src/rust-sdl
-mkdir -p src/rust-azure
-mkdir -p src/rust-cocoa
+mkdir -p src/ragel || exit $?
+mkdir -p src/harfbuzz || exit $?
+mkdir -p src/mozjs || exit $?
+mkdir -p src/rust-mozjs || exit $?
+mkdir -p src/rust-sdl || exit $?
+mkdir -p src/rust-azure || exit $?
+mkdir -p src/rust-cocoa || exit $?
 
-(cd src/ragel && sh ${SRCDIR}/src/ragel/configure)
-(cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure)
-(cd src/rust-mozjs && sh ${SRCDIR}/src/rust-mozjs/configure)
-(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)
+(cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
+(cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
+(cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure) || exit $?
+(cd src/rust-mozjs && sh ${SRCDIR}/src/rust-mozjs/configure) || exit $?
+(cd src/rust-sdl && sh ${SRCDIR}/src/rust-sdl/configure) || exit $?
+(cd src/rust-azure && sh ${SRCDIR}/src/rust-azure/configure) || exit $?
+(cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure) || exit $?
diff --git a/src/harfbuzz b/src/harfbuzz
index 2214a03900d..bf8d802d129 160000
--- a/src/harfbuzz
+++ b/src/harfbuzz
@@ -1 +1 @@
-Subproject commit 2214a03900d32710573a1b05c7665195b3129761
+Subproject commit bf8d802d1295189f35d49db4dd0e9da5bf676864