diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..634dad00
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: go
+sudo: false
+go:
+  - 1.4
+
+addons:
+  apt:
+    packages:
+    - libpcap-dev
+
+install: 
+  - go clean -i net
+  - go install -tags netgo std
+  - make travis
+
+script: make tests
diff --git a/Makefile b/Makefile
index 017b6a20..98df0b77 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PUBLISH=publish_weave publish_weavedns publish_weaveexec
 
 .DEFAULT: all
-.PHONY: all update tests publish $(PUBLISH) clean prerequisites build
+.PHONY: all update tests publish $(PUBLISH) clean prerequisites build travis
 
 # If you can use docker without being root, you can do "make SUDO="
 SUDO=sudo
@@ -23,6 +23,8 @@ DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(WEAVEEXEC
 
 all: $(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT)
 
+travis: $(WEAVER_EXE) $(WEAVEDNS_EXE)
+
 update:
 	go get -u -f -v -tags -netgo ./$(dir $(WEAVER_EXE)) ./$(dir $(WEAVEDNS_EXE))
 
diff --git a/README.md b/README.md
index b3f686d1..34fbe202 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Weave - the Docker network
 
+[![Build Status](https://travis-ci.org/zettio/weave.svg?branch=master)](https://travis-ci.org/zettio/weave)
+
 Weave creates a virtual network that connects Docker containers
 deployed across multiple hosts.