diff --git a/Makefile b/Makefile
index d51fc0695..3644855b5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,9 @@ BUILDFLAGS=-DVTY
 build: setbuildversion tag
 	$(BUILD) $(BUILDFLAGS)
 
-# force a full rebuild with normal optimisation
-rebuild: clean build
-
 # build the fastest binary we can, as hledgeropt
 BUILDOPT=ghc --make hledger.hs -o hledgeropt -O2 -fvia-C
-buildopt:
+buildopt opt:
 	$(BUILDOPT)
 
 # recompile and run tests (or another command) whenever a module changes
@@ -21,6 +18,9 @@ CICMD=test
 continuous ci:
 	sp --no-exts --no-default-map -o hledger ghc --make hledger.hs $(BUILDFLAGS) --run $(CICMD)
 
+# force a full rebuild with normal optimisation
+rebuild: clean build
+
 # run code tests
 test:
 	./hledger.hs test