diff --git a/misc/docker/camlistored/.gitignore b/misc/docker/camlistored/.gitignore
new file mode 100644
index 000000000..488219308
--- /dev/null
+++ b/misc/docker/camlistored/.gitignore
@@ -0,0 +1 @@
+camlistored
diff --git a/misc/docker/camlistored/Dockerfile b/misc/docker/camlistored/Dockerfile
new file mode 100644
index 000000000..2e68ddc8a
--- /dev/null
+++ b/misc/docker/camlistored/Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+MAINTAINER Brad Fitzpatrick <brad@danga.com>
+ADD camlistored /camlistored
+EXPOSE 80 443
+ENTRYPOINT ["/camlistored"]
diff --git a/misc/docker/camlistored/Makefile b/misc/docker/camlistored/Makefile
new file mode 100644
index 000000000..bd0e7b0f4
--- /dev/null
+++ b/misc/docker/camlistored/Makefile
@@ -0,0 +1,5 @@
+docker: Dockerfile camlistored
+	docker build -t camlistore/camlistored .
+
+camlistored:
+	CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' -o camlistored camlistore.org/server/camlistored