diff --git a/.dockerignore b/.dockerignore
index b48e6cc..d31068e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,5 +11,6 @@ config.php
 composer.json
 composer.lock
 CONTRIBUTORS.md
+docker-compose.yml
 Makefile
 README.markdown
diff --git a/ChangeLog b/ChangeLog
index c511f89..6603156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Version 1.2.0 (unreleased)
 * Disable automatically a feed after too many failures
 * Add support for Expires and Cache-Control headers (HTTP cache)
 * Update Docker image to Ubuntu 16.04 and PHP 7.0
+* Add Docker compose file
 * Add unit tests
 
 Migration procedure from 1.1.x to 1.2.0:
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..ebe70d5
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '2'
+services:
+  miniflux:
+    image: miniflux/miniflux:latest
+    ports:
+     - "80:80"
+    volumes:
+     - miniflux_data:/var/www/html/data
+volumes:
+  miniflux_data:
+    driver: local
diff --git a/docs/docker.markdown b/docs/docker.markdown
index b8d719e..9a6b930 100644
--- a/docs/docker.markdown
+++ b/docs/docker.markdown
@@ -15,6 +15,18 @@ docker run -d --name miniflux -p 80:80 -t miniflux/miniflux:latest
 
 The tag **latest** is the **development version** of Miniflux, use at your own risk.
 
+Use Docker Compose
+------------------
+
+The Git repository contains a `docker-compose.yml` file, so you can run easily Miniflux:
+
+```bash
+docker-compose up -d
+```
+
+- By default, the service listen on port 80
+- A named volume is created to store your data on the host machine
+
 Build your own image
 --------------------
 
@@ -27,5 +39,3 @@ Run container from the image:
 ```bash
 docker run -p 80:80 --name miniflux <yourname/imagename>
 ```
-
-You can also mount the volume `/var/www/html/data` to save the data on the host machine (this folder must have write access from the container web server user).