diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..57fed75
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,32 @@
+dist: trusty
+sudo: required
+
+services: docker
+
+language: bash
+
+branches:
+  only:
+    - master
+
+before_script:
+  - env | sort
+  - name="roundcubemail"
+  - image="roundcube/roundcubemail:${VERSION}${VARIANT:+-$VARIANT}"
+  - dir="php-${VARIANT}"
+
+script:
+  - travis_retry docker build -t "$image" "$dir"
+
+after_script:
+  - docker images
+  - docker run --name "$name" -d "$image" "$dir"
+  - docker ps
+  - docker logs "$name"
+
+notifications:
+  email: false
+
+env: # Environments
+    - VERSION=1.3.4 VARIANT=fpm
+    - VERSION=1.3.4 VARIANT=apache
diff --git a/README.md b/README.md
index b626468..5f7f94d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+
+[![Build Status](https://travis-ci.org/roundcube/roundcubemail-docker.svg)](https://travis-ci.org/roundcube/roundcubemail-docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/roundcube/roundcubemail.svg)](https://hub.docker.com/r/roundcube/roundcubemail/)
+
 # Running Roundcube in a Docker Container
 
 The simplest method is to run the official image:
diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 4f3fce3..115d87a 100644
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.1-apache
-MAINTAINER Thomas Bruederli <thomas@roundcube.net>
+LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN apt-get -qq update \
   && apt-get install -qq \
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index b0c086e..79c226c 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.1-fpm
-MAINTAINER Thomas Bruederli <thomas@roundcube.net>
+LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN apt-get -qq update \
   && apt-get install -qq \