diff --git a/Makefile b/Makefile
index 9d130cb..06e7728 100644
--- a/Makefile
+++ b/Makefile
@@ -19,22 +19,29 @@ clean:
 export-all: export-html5 export-windows export-osx export-linux
 
 export-pack: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "pack" "../$(BUILD_DIR)/$(PROJECT_NAME).pck"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "pack" "../$(BUILD_DIR)/$(PROJECT_NAME).pck"
 
 export-html5: build-dir
 	mkdir -p "$(BUILD_DIR)/html"
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_HTML5)" "../$(BUILD_DIR)/html/$(PROJECT_NAME).html"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_HTML5)" "../$(BUILD_DIR)/html/$(PROJECT_NAME).html"
 	zip -j -r "$(BUILD_DIR)/$(PROJECT_NAME)-html5.zip" "$(BUILD_DIR)/html"
 	rm -rf "$(BUILD_DIR)/html"
 
 export-windows: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_WINDOWS)" "../$(BUILD_DIR)/$(PROJECT_NAME).exe"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_WINDOWS)" $(PROJECT_NAME).exe
+	mkdir -p "$(BUILD_DIR)/win/"
+	mv -t "$(BUILD_DIR)/win/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).exe* $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).pck
 
 export-osx: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_MACOSX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-osx"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_MACOSX)" $(PROJECT_NAME).osx
+	mkdir -p "$(BUILD_DIR)/osx/"
+	# Data is bundled into $(PROJECT_NAME).osx
+	mv -t "$(BUILD_DIR)/osx/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).osx*
 
 export-linux: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_LINUX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-x11"
+	$(GODOT) --path $(GODOT_PROJECT_PATH) --export_debug --export "$(TARGET_LINUX)" $(PROJECT_NAME)-x11
+	mkdir -p "$(BUILD_DIR)/x11/"
+	mv -t "$(BUILD_DIR)/x11/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME)-x11*
 
 install-templates:
 	mkdir -p $(GODOT_TEMPLATE_DIR)