diff --git a/Changelog.md b/Changelog.md
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index b6c9743..d4203c6 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,27 @@
Baseimage-docker is a [Docker](http://www.docker.io) image meant to serve as a good base for any other Docker container. It contains a minimal base system with the most important things already installed and set up correctly.
+ * **Github**: https://github.com/phusion/baseimage-docker
+ * **Discussion forum**: https://groups.google.com/d/forum/passenger-docker
+ * **Twitter**: https://twitter.com/phusion_nl
+ * **Blog**: http://blog.phusion.nl/
+
## Why should I use baseimage-docker?
Why use baseimage-docker instead of doing everything yourself in Dockerfile?
* It reduces the time needed to write a correct Dockerfile. You won't have to worry about the base system and can focus on your stack and your app.
* It sets up the base system **correctly**. It's very easy to get the base system wrong, but this image does everything correctly.
+ * It reduces the time needed to run `docker build`, allowing you to iterate your Dockerfile more quickly.
## Contents
+*Looking for a more complete base image, one that is ideal for web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker).*
+
| Component | Why is it included? / Remarks |
| ---------------- | ------------------- |
| Ubuntu 12.04 LTS | The base system. |
-| A **correct** init process | According to the Unix process model, the init process -- PID 1 -- inherit all [orphaned child processes](https://en.wikipedia.org/wiki/Orphan_process) and must [reap them](https://en.wikipedia.org/wiki/Wait_(system_call)). Most Docker containers do not have an init process that does this correctly, and as a result their containers become filled with [zombie processes](https://en.wikipedia.org/wiki/Zombie_process) over time. Baseimage-docker comes with an init process `/sbin/my_init` that performs reaping correctly. |
+| A **correct** init process | According to the Unix process model, [the init process](https://en.wikipedia.org/wiki/Init) -- PID 1 -- inherit all [orphaned child processes](https://en.wikipedia.org/wiki/Orphan_process) and must [reap them](https://en.wikipedia.org/wiki/Wait_(system_call)). Most Docker containers do not have an init process that does this correctly, and as a result their containers become filled with [zombie processes](https://en.wikipedia.org/wiki/Zombie_process) over time. Baseimage-docker comes with an init process `/sbin/my_init` that performs reaping correctly. |
| Fixes APT incompatibilities with Docker | See https://github.com/dotcloud/docker/issues/1024. |
| syslog-ng | A syslog daemon is necessary so that many services - including the kernel itself - can correctly log to /var/log/syslog. If no syslog daemon is running, a lot of important messages are silently swallowed.
Only listens locally. |
| ssh server | Allows you to easily login to your container to inspect or administer things.
Password and challenge-response authentication are disabled by default. Only key authentication is allowed.
It allows an predefined key by default to make debugging easy. You should replace this ASAP. See instructions. |
@@ -22,10 +30,14 @@ Why use baseimage-docker instead of doing everything yourself in Dockerfile?
## Using baseimage-docker as base image
-The image name is `phusion/baseimage`. Here's how your Dockerfile may look like:
+The image is called `phusion/baseimage`, and is available on the Docker registry.
+
+By default, it allows SSH access for the key in `image/insecure_key`. This makes it easy for you to login to the container, but you should replace this key as soon as possible.
# Use phusion/baseimage as base image. To make your builds reproducible, make
# sure you lock down to a specific version, not to `latest`!
+ # See https://github.com/phusion/baseimage-docker/blob/master/Changelog.md for
+ # a list of version numbers.
FROM phusion/baseimage:
# Remove authentication rights for insecure_key.
@@ -38,3 +50,36 @@ The image name is `phusion/baseimage`. Here's how your Dockerfile may look like:
# Clean up APT when done.
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+## Building the image yourself
+
+If for whatever reason you want to build the image yourself instead of downloading it from the Docker registry, follow these instructions.
+
+Clone this repository:
+
+ git clone https://github.com/phusion/baseimage-docker.git
+ cd baseimage-docker
+
+Start a virtual machine with Docker in it. You can use the Vagrantfile that we've already provided.
+
+ vagrant up
+ vagrant ssh
+ cd /vagrant
+
+Build the image:
+
+ make build
+
+If you want to call the resulting image something else, pass the NAME variable, like this:
+
+ make build NAME=joe/baseimage
+
+## Conclusion
+
+ * Using baseimage-docker? [Tweet about us](https://twitter.com/share) or [follow us on Twitter](https://twitter.com/phusion_nl).
+ * Having problems? Please post a message at [the discussion forum](https://groups.google.com/d/forum/passenger-docker).
+ * Looking for a more complete base image, one that is ideal for web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker).
+
+[
](http://www.phusion.nl/)
+
+Please enjoy baseimage-docker, a product by [Phusion](http://www.phusion.nl/). :-)