diff --git a/Dockerfile-docs b/Dockerfile-docs
new file mode 100644
index 0000000000..1103ffd179
--- /dev/null
+++ b/Dockerfile-docs
@@ -0,0 +1,9 @@
+FROM python:2.7
+
+RUN mkdir /home/docker-py
+WORKDIR /home/docker-py
+
+COPY docs-requirements.txt /home/docker-py/docs-requirements.txt
+RUN pip install -r docs-requirements.txt
+
+COPY . /home/docker-py
diff --git a/Makefile b/Makefile
index a635edfad5..3a8f5e8c3f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ build:
 build-py3:
 	docker build -t docker-py3 -f Dockerfile-py3 .
 
+build-docs:
+	docker build -t docker-py-docs -f Dockerfile-docs .
+
 build-dind-certs:
 	docker build -t dpy-dind-certs -f tests/Dockerfile-dind-certs .
 
@@ -57,3 +60,6 @@ integration-dind-ssl: build-dind-certs build build-py3
 
 flake8: build
 	docker run docker-py flake8 docker tests
+
+docs: build-docs
+	docker run -v `pwd`/docs:/home/docker-py/docs/ -p 8000:8000 docker-py-docs mkdocs serve -a 0.0.0.0:8000
diff --git a/docs-requirements.txt b/docs-requirements.txt
index abc8d72db6..aede1cbadf 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1 +1 @@
-mkdocs==0.9
+mkdocs==0.15.3