diff --git a/Makefile b/Makefile
index e71a74dc8..9ae2f28fa 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ full:
 forcefull:
 	go install -a --tags=with_sqlite ./pkg/... ./server/... ./cmd/... ./third_party/... ./dev/...
 
-presubmit:
+presubmit: fmt
 	SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/camlistored/... ./server/appengine ./cmd/... ./dev/... && echo PASS
 
 embeds:
@@ -29,6 +29,9 @@ NEWUIDIR = server/camlistored/newui
 clean:
 	rm -f $(NEWUIDIR)/all.js $(NEWUIDIR)/all.js.map
 
+fmt:
+	go fmt camlistore.org/cmd... camlistore.org/dev... camlistore.org/misc... camlistore.org/pkg... camlistore.org/server...
+
 genclosuredeps: $(UIDIR)/deps.js
 
 $(UIDIR)/deps.js: $(UIDIR)/blobinfo.js $(UIDIR)/blob_item.js $(UIDIR)/blob_item_container.js $(UIDIR)/create_item.js $(UIDIR)/filetree.js $(UIDIR)/index.js $(UIDIR)/permanode.js $(UIDIR)/pics.js $(UIDIR)/server_connection.js $(UIDIR)/server_connection.js $(UIDIR)/search.js $(UIDIR)/server_type.js $(UIDIR)/sigdebug.js $(UIDIR)/toolbar.js $(UIDIR)/base64.js $(UIDIR)/Crypto.js $(UIDIR)/SHA1.js
diff --git a/TODO b/TODO
index ffb9dd097..74142e1bd 100644
--- a/TODO
+++ b/TODO
@@ -195,8 +195,6 @@ Offline list:
    be able to reload itself, and also watch for binaries changing and restart
    when binaries change.  (or symlinks to binaries)
 
--- add gofmt check to "make presubmit". also add "make fmt" target.
-
 -- BUG: osutil paths.go on OS X: should use Library everywhere instead of mix of
    Library and ~/.camlistore?