diff --git a/.build.yml b/.build.yml
index 49fb917..fa9a49f 100644
--- a/.build.yml
+++ b/.build.yml
@@ -5,6 +5,9 @@ packages:
 sources:
 - https://git.sr.ht/~rjarry/aerc
 tasks:
+- checkfmt: |
+    cd aerc
+    make checkfmt
 - build: |
     cd aerc
     make
diff --git a/Makefile b/Makefile
index c481976..d352fbe 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,18 @@ aerc: $(GOSRC)
 		-X main.Version=$(VERSION)" \
 		-o $@
 
+.PHONY: fmt
+fmt:
+	gofmt -w .
+
+.PHONY: checkfmt
+checkfmt:
+	@if [ `gofmt -l . | wc -l` -ne 0 ]; then \
+		gofmt -d .; \
+		echo "ERROR: source files need reformatting with gofmt"; \
+		exit 1; \
+	fi
+
 aerc.conf: config/aerc.conf.in
 	sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in