diff --git a/.gitattributes b/.gitattributes
index 9b4c80545..cb13e8da3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -32,3 +32,8 @@
 /Makefile	text eol=lf
 
 # More attributes are defined in per-directory .gitattributes which override this file
+
+# Not needed in source distribution for building GCS
+/artwork/       export-ignore
+/flight/        export-ignore
+/hardware/      export-ignore
diff --git a/Makefile b/Makefile
index d6f9049b4..fe2e09e94 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,8 @@ endif
 FLIGHT_OUT_DIR := $(BUILD_DIR)/firmware
 DIRS += $(FLIGHT_OUT_DIR)
 
-include $(ROOT_DIR)/flight/Makefile
+# Might not be here in source package
+-include $(ROOT_DIR)/flight/Makefile
 
 ##############################
 #