diff --git a/haproxy/README-short.txt b/haproxy/README-short.txt
new file mode 100644
index 000000000..87c260a6c
--- /dev/null
+++ b/haproxy/README-short.txt
@@ -0,0 +1 @@
+HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer
diff --git a/haproxy/content.md b/haproxy/content.md
new file mode 100644
index 000000000..3bb9be825
--- /dev/null
+++ b/haproxy/content.md
@@ -0,0 +1,36 @@
+# What is HAProxy?
+
+HAProxy is a free, open source high availability solution, providing load
+balancing and proxying for TCP and HTTP-based applications by spreading requests
+across multiple servers. It is written in C and has a reputation for being fast
+and efficient (in terms of processor and memory usage).
+
+> [wikipedia.org/wiki/HAProxy](https://en.wikipedia.org/wiki/HAProxy)
+
+%%LOGO%%
+
+# How to use this image
+
+Since no two users of HAProxy are likely to configure it exactly alike, this
+image does not come with any default configuration.
+
+Please refer to [upstream's excellent (and comprehensive)
+documentation](https://cbonte.github.io/haproxy-dconv/) on the subject of
+configuring HAProxy for your needs.
+
+It is also worth checking out the [`examples/` directory from
+upstream](http://www.haproxy.org/git?p=haproxy-1.5.git;a=tree;f=examples).
+
+## Create a `Dockerfile`
+
+    FROM haproxy:1.5
+    COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
+
+Build and run:
+
+    docker build -t my-haproxy .
+    docker run -d --name my-running-haproxy my-haproxy
+
+## Directly via bind mount
+
+    docker run -d --name my-running-haproxy -v /path/to/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro haproxy:1.5
diff --git a/haproxy/license.md b/haproxy/license.md
new file mode 100644
index 000000000..a7c14c703
--- /dev/null
+++ b/haproxy/license.md
@@ -0,0 +1,2 @@
+View [license information](http://www.haproxy.org/download/1.5/doc/LICENSE) for
+the software contained in this image.
diff --git a/haproxy/logo.png b/haproxy/logo.png
new file mode 100644
index 000000000..1be03b25a
Binary files /dev/null and b/haproxy/logo.png differ