diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..e9e390e523
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:2.7-alpine
+MAINTAINER Dan Feeney "feend78@gmail.com"
+RUN apk update && apk add gcc musl-dev
+ENV REFRESHED_AT 2016-12-09
+ADD . /usr/src/evennia
+RUN pip install -e /usr/src/evennia
+ONBUILD ADD . /usr/src/game
+VOLUME /usr/src/game
+WORKDIR /usr/src/game
+CMD ["evennia", "-l", "-i", "start"]
+EXPOSE 8000 8001 4000
diff --git a/evennia/game_template/Dockerfile b/evennia/game_template/Dockerfile
new file mode 100644
index 0000000000..44bba7ffd2
--- /dev/null
+++ b/evennia/game_template/Dockerfile
@@ -0,0 +1 @@
+FROM evennia/evennia:latest