diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..e36f6f351
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+# Travis-CI Build for libgit2
+# see travis-ci.org for details
+
+# As CMake is not officially supported we use erlang VMs
+language: erlang
+
+# Settings to try
+env:
+  - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
+  - OPTIONS="-DBUILD_CLAR=ON"
+      
+# Make sure CMake is installed
+install:
+ - sudo apt-get install cmake
+
+# Run the Build script
+script:
+ - mkdir _build
+ - cd _build
+ - cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS
+ - cmake --build . --target install
+
+# Run Tests
+after_script:
+ - ctest .
+
+# Only watch the development branch
+branches:
+ only:
+   - development
+   
+# Notify development list when needed
+notifications:
+ recipients:
+   - drahosp@gmail.com # CHANGE!
+ email:
+   on_success: change
+   on_failure: always
\ No newline at end of file
diff --git a/AUTHORS b/AUTHORS
index 1d6235cf1..954f25964 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,7 +36,6 @@ Marc Pegon
 Marcel Groothuis
 Marco Villegas
 Olivier Ramonat
-Peter Drahos
 Peter Drahoš
 Pierre Habouzit
 Przemyslaw Pawelczyk
diff --git a/README.md b/README.md
index d2c777cdc..755a62b08 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 libgit2 - the Git linkable library
 ======================
 
+[![Build Status](https://secure.travis-ci.org/libgit2/libgit2.png?branch=development)](http://travis-ci.org/libgit2/libgit2)
+
 libgit2 is a portable, pure C implementation of the Git core methods provided as a
 re-entrant linkable library with a solid API, allowing you to write native
 speed custom Git applications in any language with bindings.