diff --git a/Makefile b/Makefile
index b37be265..bdbffa15 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,9 @@ fuzz-run: $(GOFUZZ_BIN)
 # UTILITIES
 # =========
 
-fmt:
+fmt: goimports
+	@$(call print, "Fixing imports.")
+	goimports -w $(GOFILES_NOVENDOR)
 	@$(call print, "Formatting source.")
 	gofmt -l -w -s $(GOFILES_NOVENDOR)