diff --git a/Changelog b/Changelog
index 5adc36a..13321dd 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+kiwix-tools 1.2.0
+=================
+
+kiwix-serve
+-----------
+
+ * New Dockerfile of kiwix-serve
+
 kiwix-tools 1.1.0
 =================
 
diff --git a/README.md b/README.md
index 1b2e196..4c11baa 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,12 @@ ninja -C build uninstall
 Like for the installation, you might need to run the command as root
 (or using 'sudo').
 
+Docker
+------
+
+An official Docker image of `kiwix-serve` can be found at
+https://hub.docker.com/r/kiwix/kiwix-serve.
+
 Troubleshooting
 ---------------
 
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
new file mode 100644
index 0000000..d96d735
--- /dev/null
+++ b/docker/server/Dockerfile
@@ -0,0 +1,15 @@
+FROM alpine:latest
+LABEL maintainer Emmanuel Engelhart <kelson@kiwix.org>
+
+# Install kiwix-serve
+WORKDIR /
+RUN apk add --no-cache curl bzip2
+RUN curl -kL https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-x86_64-1.1.0.tar.gz | tar -xz && \
+    mv kiwix-tools*/kiwix-serve /usr/local/bin && \
+    rm -r kiwix-tools*
+
+# Run kiwix-serve
+EXPOSE 80
+VOLUME /data
+WORKDIR /data
+ENTRYPOINT ["/usr/local/bin/kiwix-serve", "--port", "80"]
diff --git a/docker/server/README.md b/docker/server/README.md
new file mode 100644
index 0000000..9e3d148
--- /dev/null
+++ b/docker/server/README.md
@@ -0,0 +1,13 @@
+kiwix-serve Docker image
+========================
+
+* Download a ZIM file from <https://wiki.kiwix.org/wiki/Content>
+
+* Given `wikipedia.zim` resides in `/tmp/zim/`, execute the following:
+
+```
+docker run -v /tmp/zim:/data -p 8080:80 kiwix/kiwix-serve wikipedia.zim
+```
+
+![screenshot_1.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_1.png)
+![screenshot_2.png](https://github.com/kiwix/kiwix-tools/raw/master/docker/server/pictures/screenshot_2.png)
diff --git a/docker/server/pictures/screenshot_1.png b/docker/server/pictures/screenshot_1.png
new file mode 100644
index 0000000..d81c503
Binary files /dev/null and b/docker/server/pictures/screenshot_1.png differ
diff --git a/docker/server/pictures/screenshot_2.png b/docker/server/pictures/screenshot_2.png
new file mode 100644
index 0000000..2514803
Binary files /dev/null and b/docker/server/pictures/screenshot_2.png differ