diff --git a/Makefile b/Makefile
index 0dc9732..a3f9f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ all: build
 build: $(OUTPUT)
 
 $(OUTPUT): $(SRC) $(ORDER)
-	@rm -f $(OUTPUT)
-	@while read f; do \
+	 @rm -f $(OUTPUT)
+	 @while read f; do \
 		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
 		echo "" >> $(OUTPUT); \
 	done < $(ORDER)
@@ -46,8 +46,13 @@ export_assets: build
 		$(OUTPUT) > $(ASSETS_LUA)
 
 export: build
-	tic80 --cli --skip --fs=. \
-		--cmd="load $(OUTPUT) & save $(PROJECT) & export html $(PROJECT).html & exit"
+	@{ \
+	    VERSION=$$(sed -n 's/^-- version: //p' $(OUTPUT) | head -n 1); \
+	    echo "==> Exporting HTML for version $$VERSION"; \
+	    mkdir -p "$$VERSION"; \
+	    tic80 --cli --skip --fs=. \
+		    --cmd="load $(OUTPUT) & save $(PROJECT) & export html $$VERSION/$(PROJECT).html & exit"; \
+	}
 
 watch:
 	make build