diff --git a/.gitignore b/.gitignore
index afd7a3c11d7..67164a1cebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@
 servo-test
 Makefile
 Servo.app
-build
\ No newline at end of file
+build
+configure
\ No newline at end of file
diff --git a/README.md b/README.md
index 35120c0baee..c5d44f8c790 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,24 @@
 ## The Servo Parallel Browser Project
 
-It builds on Linux and OS X and requires the newest rustc you can find
+I currently build on OS X and Linux.
+
+### Prerequisites
+
+On OS X:
+
+    brew install sdl cairo
+
+On Debian-based Linuxes:
+
+    sudo apt-get install sdl cairo
+
+### Building
 
     git clone git://github.com/mozilla/servo.git
     cd servo
     git submodule init
     git submodule update
+    ./autogen.sh
     mkdir build && cd build
     ../configure
     make check && make
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 00000000000..af58c83d518
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+(cd src/mozjs/js/src && autoconf)
+
+cp -f configure.in configure
diff --git a/configure b/configure.in
similarity index 100%
rename from configure
rename to configure.in
diff --git a/src/mozjs b/src/mozjs
index a971b9dd539..e8ffa4638b1 160000
--- a/src/mozjs
+++ b/src/mozjs
@@ -1 +1 @@
-Subproject commit a971b9dd53975db0225bb900c216f2a1f4cd1de9
+Subproject commit e8ffa4638b185dc2a7303fadcd253599684f0028