diff --git a/Makefile b/Makefile
index fe297ad6f3c7724ee4a552bad12d9f475733632b..5853a553951575ea43fe4a269dccf78bf70fb81e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
 MAKEFLAGS += -r
+export TWEEGO_PATH=devTools/tweeGo/storyFormats
 HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
 COMMIT := $(shell git rev-parse --short HEAD)
 uname := $(shell uname -s)
 arch := $(shell uname -m)
+arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
 TWEEGO := $(shell command -v tweego || echo "$$?")
 ifeq ($(TWEEGO),1)
 	ifeq ($(uname),Linux)
-		ifeq ($(arch),x86_64)
-			TWEEGO := ./devTools/tweeGo/tweego_nix64
+		ifeq ($(arch),64)
+			TWEEGO := devTools/tweeGo/tweego_nix64
 		else
-			TWEEGO := ./devTools/tweeGo/tweego_nix86
+			TWEEGO := devTools/tweeGo/tweego_nix86
 		endif
 	else ifeq ($(uname),Darwin)
-		ifeq ($(arch),x86_64)
-			TWEEGO := ./devTools/tweeGo/tweego_osx64
+		ifeq ($(arch),64)
+			TWEEGO := devTools/tweeGo/tweego_osx64
 		else
-			TWEEGO := ./devTools/tweeGo/tweego_osx86
+			TWEEGO := devTools/tweeGo/tweego_osx86
 		endif
 	endif
 endif
@@ -27,17 +29,16 @@ git: bin/FC_pregmod_$(HASH).html bin/resources
 bin/resources: resources
 	test -L "$@" || ln -s "../$<" bin/
 
-bin/FC_pregmod%.html: bin/FC_pregmod_tmp
+bin/%.html: bin/tmp
 	git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
 	mv $< $@
 
-bin/FC_pregmod_tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw
-	TWEEGO_PATH=devTools/tweeGo/storyFormats $(TWEEGO) -o $@ src/ --head devTools/head.html
-	./devTools/embed_favicon.py $@
+bin/tmp: bin/ src/gui/mainMenu/AlphaDisclaimer.tw
+	$(TWEEGO) src/ --head devTools/head.html > $@
+	devTools/embed_favicon.py $@
 
 src/gui/mainMenu/AlphaDisclaimer.tw:
 	sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
-	sed -Ei "s/build .releaseID/\0 commit $(COMMIT)/" $@
 
 bin/:
 	mkdir -p $@