diff --git a/misc/docker/camlistored/Makefile b/misc/docker/camlistored/Makefile
index f5d685293..73f1513fd 100644
--- a/misc/docker/camlistored/Makefile
+++ b/misc/docker/camlistored/Makefile
@@ -1,18 +1,11 @@
-docker: Dockerfile camlistored djpeg
-	docker build -t camlistored .
+# TODO: delete this whole file and move into dock.go. Even the
+# uploading should be direct from Go instead of using gsutil. See how
+# golang.org/x/build/... does it and its cmd/upload etc. Also, we can
+# use golang.org/x/oauth2/google's DefaultApplicationContext now too
+# probably.
 
-.PHONY: djpeg
-
-djpeg:
-	(cd ../djpeg-static/; make djpeg; cp djpeg ../camlistored/)
-
-.PHONY: camlistored
-
-camlistored:
-	(cd ../../../; go run make.go --docker_camlistored)
-
-camlistored.tar.gz: docker
-	docker save camlistored | gzip -c > $@
+camlistored.tar.gz:
+	docker save camlistore/server | gzip -c > $@
 
 push: camlistored.tar.gz
 	gsutil cp $< gs://camlistore-release/docker/