diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..49e3048
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM scratch
+USER 99
+ADD whois42d /
+CMD ["/whois42d", "-registry", "/registry", "-port", "4343"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5fb782c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+VERSION?=1.0
+
+container:
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o whois42d .
+	strip whois42d
+	docker build -t mic92/whois42d:$(VERSION) .
+
+upload:
+	docker tag -f mic92/whois42d:$(VERSION) mic92/whois42d:latest
+	docker push mic92/whois42d