diff --git a/docker/Dockerfile b/Dockerfile
similarity index 92%
rename from docker/Dockerfile
rename to Dockerfile
index e41e777..f2e7ef6 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ RUN \
   rm /etc/lighttpd/lighttpd.conf
 
 ADD \
-  lighttpd.conf /etc/lighttpd/lighttpd.conf
+  scripts/docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 EXPOSE 80
 
diff --git a/README.markdown b/README.markdown
index f42370d..4bcfbd9 100644
--- a/README.markdown
+++ b/README.markdown
@@ -71,6 +71,7 @@ Documentation
 - [Themes](docs/themes.markdown)
 - [Json-RPC API](docs/json-rpc-api.markdown)
 - [Fever API](docs/fever.markdown)
+- [Run Miniflux with Docker](docs/docker.markdown)
 - [FAQ](docs/faq.markdown)
 
 Todo and known bugs
@@ -113,6 +114,7 @@ People who sent a pull-request, report a bug, make a new theme or share a super
 - [Julian Oster](https://github.com/jlnostr)
 - [Jarek](https://github.com/jarek)
 - [Luca Marra](https://github.com/facciocose)
+- [Martin Simon](https://github.com/c0ding)
 - [Mathias Kresin](https://github.com/mkresin)
 - [Maxime](https://github.com/EpocDotFr)
 - [Meradoou](https://github.com/meradoou)
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index 19cdf66..0000000
--- a/docker/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Installation
-==========
-
-
-## Build image :
-
-```
-docker build -t <yourname/imagename> .
-```
-
-## Run container from image :
-
-```
-docker run -p 80:80 --name miniflux <yourname/imagename>
-```
-
-Enjoy!
\ No newline at end of file
diff --git a/docs/docker.markdown b/docs/docker.markdown
new file mode 100644
index 0000000..493312b
--- /dev/null
+++ b/docs/docker.markdown
@@ -0,0 +1,18 @@
+Run Miniflux with Docker
+========================
+
+Build your own image
+--------------------
+
+```bash
+docker build -t <yourname/imagename> .
+```
+
+Run container from the image
+----------------------------
+
+```bash
+docker run -p 80:80 --name miniflux <yourname/imagename>
+```
+
+Enjoy!
diff --git a/docker/lighttpd.conf b/scripts/docker/lighttpd.conf
similarity index 100%
rename from docker/lighttpd.conf
rename to scripts/docker/lighttpd.conf