diff --git a/.gitignore b/.gitignore
index 11f5c4ed..5b169b0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .gitignore
 .idea/
 output/
+output-main/
 html_data.c
 html_data.h
 version.h
diff --git a/Makefile b/Makefile
index c95f12af..5ebd9ddf 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,10 @@ endif
 # The board definition being built: one file per MACHINE_* symbol in machine.h.
 MACHINE_SRC = machine/$(MACHINE).c
 
-BUILDDIR = output/$(MACHINE)
+ifndef BUILDDIR
+	BUILDDIR = output/$(MACHINE)
+endif
+
 VERSION_HEADER := version.h
 
 GIT_VERSION := $(shell git rev-parse --short HEAD)