diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b702db3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM ubuntu
+MAINTAINER Rob Haswell <me@robhaswell.co.uk>
+
+RUN apt-get -qqy update
+RUN apt-get -qqy upgrade
+RUN apt-get -qqy install python-pip
+
+ADD . /usr/src/app/
+WORKDIR /usr/src/app
+
+RUN python setup.py install
+RUN pip install -r requirements.txt
+
+CMD ["python", "dropbot/cli.py", "-c", "env"]
diff --git a/MANIFEST.in b/MANIFEST.in
index bb3ec5f..fa9bd66 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
 include README.md
+include dropbot/data/*
diff --git a/README.md b/README.md
index 710f841..1839efc 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,13 @@ Setup
 
 Dropbot is designed to run on Heroku, but can be ran locally using ```python dropbot\cli.py -c env```
 
+Docker
+------
+
+Dropbot can be run on Docker using the image ``robhaswell/docker``:
+
+    docker run -ti -e DROPBOT_JID='user@server' -e DROPBOT_PASSWORD='password' -e DROPBOT_ROOMS='room@server' robhaswell/dropbot
+
 Configuration
 -------------