diff --git a/Makefile b/Makefile
index e1cbb45a6b..ae57219e3c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ build: dependencies $(GOPATH)
 	$(GO) build -o prometheus $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/prometheus
 	$(GO) build -o promtool $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/promtool
 
-docker: build
+docker:
 	docker build -t prometheus:$(REV) .
 
 tarball: $(ARCHIVE)
diff --git a/README.md b/README.md
index f27a9d1a5f..d671fa4a06 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Prometheus [![Build Status](https://travis-ci.org/prometheus/prometheus.svg)](https://travis-ci.org/prometheus/prometheus)
+# Prometheus [![Build Status](https://travis-ci.org/prometheus/prometheus.svg)](https://travis-ci.org/prometheus/prometheus) [![Circle CI](https://circleci.com/gh/prometheus/prometheus/tree/master.svg?style=svg)](https://circleci.com/gh/prometheus/prometheus/tree/master)
 
 Prometheus is a systems and service monitoring system. It collects metrics
 from configured targets at given intervals, evaluates rule expressions,
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000000..b24c203ffb
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,11 @@
+machine:
+  services:
+    - docker
+
+dependencies:
+  override:
+    - make docker
+
+test:
+  override:
+    - /bin/true