diff --git a/.gitignore b/.gitignore
index 09164c65..9739d092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 *.orig
 *.sdf
 *.suo
+core
+vgcore.*
 /out/
 /build/gyp
 
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..f3b176fe
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: node_js
+
+script:
+  - "make test"
+
+notifications:
+  email: false
+  irc:
+    - "irc.freenode.net#libuv"
diff --git a/AUTHORS b/AUTHORS
index 40286bcf..56c20e77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,3 +36,4 @@ Tj Holowaychuk <tj@vision-media.ca>
 Shimon Doodkin <helpmepro1@gmail.com>
 Ryan Emery <seebees@gmail.com>
 Bruce Mitchener <bruce.mitchener@gmail.com>
+Maciej Małecki <maciej.malecki@notimplemented.org>
diff --git a/README.md b/README.md
index bd4945a9..f86a0000 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# libuv
+# libuv [![Build Status](https://secure.travis-ci.org/joyent/libuv.png)](http://travis-ci.org/joyent/libuv)
 
 libuv is a new platform layer for Node. Its purpose is to abstract IOCP on
 Windows and libev on Unix systems. We intend to eventually contain all
diff --git a/test/runner.c b/test/runner.c
index daa8a2e4..fdd81684 100644
--- a/test/runner.c
+++ b/test/runner.c
@@ -71,7 +71,7 @@ int run_tests(int timeout, int benchmark_output) {
     log_progress(total, passed, failed, "Done.\n");
   }
 
-  return 0;
+  return failed;
 }