diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5b17240
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: go
+
+install:
+    - sudo apt-get install ninja-build
+
+script:
+    - go test ./...
+    - cp build.ninja.in build.ninja.in.orig
+    - mkdir stage
+    - cd stage 
+    - ../bootstrap.bash
+    - ninja
+    - diff -us ../build.ninja.in ../build.ninja.in.orig
diff --git a/README.md b/README.md
index 45daed2..b51731a 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 Blueprint Build System
 ======================
+[![Build Status](https://travis-ci.org/google/blueprint.svg?branch=master)](https://travis-ci.org/google/blueprint) 
 
 Blueprint is a meta-build system that reads in Blueprints files that describe
-modules that need to be built, and produces a Ninja
-(http://martine.github.io/ninja/) manifest describing the commands that need to
-be run and their dependencies.  Where most build systems use built-in rules or
-a domain-specific language to describe the logic for converting module
+modules that need to be built, and produces a
+[Ninja](http://martine.github.io/ninja/) manifest describing the commands that
+need to be run and their dependencies.  Where most build systems use built-in
+rules or a domain-specific language to describe the logic for converting module
 descriptions to build rules, Blueprint delegates this to per-project build
 logic written in Go.  For large, heterogenous projects this allows the inherent
 complexity of the build logic to be maintained in a high-level language, while