diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6077e33
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+language: python
+python:
+  # we will add support for this in future. currently 2.6 via travis is unsupported.
+  #- "2.6" 
+  - "2.7"
+install:
+  - sudo apt-get install -qq python-imaging python-dev python-numpy python-numpy-dev
+  - pip install -q pillow
+  - pip install -q numpy
+  - python setup.py build
+before_script:
+  - git clone git://github.com/overviewer/Minecraft-Overviewer-Addons.git ~/mca/
+  - wget -N http://s3.amazonaws.com/MinecraftDownload/minecraft.jar -P ~/.minecraft/bin/
+script:
+  - python overviewer.py ~/mca/exmaple ~/test-output --rendermodes=smooth-lighting
+notifications:
+  irc:
+    channels: "irc.freenode.org#overviewer"
+    on_success: always
+    on_failure: always
+  email: false
+branches:
+  only:
+    - master
+    - travis
\ No newline at end of file
diff --git a/README.rst b/README.rst
index b273969..808922f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
 ====================
-Minecraft Overviewer
+Minecraft Overviewer  [![Build Status](https://secure.travis-ci.org/overviewer/Minecraft-Overviewer.png)](http://travis-ci.org/overviewer/Minecraft-Overviewer)
 ====================
 By Andrew Brown and contributors (see CONTRIBUTORS.rst).