diff --git a/TODO.md b/TODO.md
index b089cfda..6a4c55b4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,14 +1,15 @@
 
-
 # General
 
 - [ ] Syslog support
-- [ ] SSL/TLS
-- [ ] nats-top equivalent
+- [ ] SSL/TLS support
+- [ ] nats-top equivalent, utils
 - [ ] Pedantic state
 - [X] Daemon mode? Won't fix
 - [ ] Connz report routes
 - [ ] Info updates contain other implicit route servers
+- [X] Docker
+- [ ] brew, apt-get, rpm, chocately (windows)
 - [ ] Dynamic socket buffer sizes
 - [ ] Switch to 1.3 and use maps vs hashmaps
 - [ ] Buffer pools?
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 00000000..de59fe34
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,8 @@
+FROM google/golang:1.3
+
+MAINTAINER Derek Collison <derek@apcera.com>
+
+RUN CGO_ENABLED=0 go get -a -ldflags '-s' github.com/apcera/gnatsd
+COPY Dockerfile.final /gopath/bin/Dockerfile
+
+CMD docker build -t apcera/gnatsd /gopath/bin
diff --git a/docker/Dockerfile.final b/docker/Dockerfile.final
new file mode 100644
index 00000000..26dbdb81
--- /dev/null
+++ b/docker/Dockerfile.final
@@ -0,0 +1,10 @@
+FROM scratch
+
+MAINTAINER Derek Collison <derek@apcera.com>
+
+ADD gnatsd /gnatsd
+
+CMD []
+ENTRYPOINT ["/gnatsd", "-p", "4222", "-m", "8333"]
+
+EXPOSE 4222 8333
\ No newline at end of file
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000..9639adcf
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,6 @@
+# [Dockerized] (http://www.docker.com) [gnatsd](https://registry.hub.docker.com/u/apcera/gnatsd/)
+
+A docker image for gnatsd. This is created as a single static executable, so there are multiple passes through Docker to first build the static executable and then to package it under an empty (scratch) base image.
+
+
+
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 00000000..02b943c9
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+docker build -t apcera/gnatsd_build .
+docker run -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):$(which docker) -ti --name gnatsd_build apcera/gnatsd_build
+docker rm gnatsd_build
+docker rmi apcera/gnatsd_build
\ No newline at end of file