diff --git a/changelog.txt b/changelog.txt
index 693c25bf5..837c4fd21 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -13,6 +13,7 @@ fbc: BUILD_FB_DEFAULT_CPUTYPE_X86 to set FB_DEFAULT_CPUTYPE_X86 in source code;
 makefile:  DEFAULT_CPUTYPE_ARM build option to set the default ARM cpu; if given sets BUILD_FB_DEFAULT_CPUTYPE_ARM compiler configration option
 makefile: add BUILD_FB_DEFAULT_CPUTYPE_ARM to BOOTFBCFLAGS
 fbc: BUILD_FB_DEFAULT_CPUTYPE_ARM to set FB_DEFAULT_CPUTYPE_ARM in source code; if not given then default is FB_CPUTYPE_ARMV7A
+makefile: add bootstrap-dist-arm to make ARM/AARCH64 only bootstrap-source-arm package (convenience for different build requirements and not building every source bootstrap target)
 
 [fixed]
 
diff --git a/makefile b/makefile
index 484d3da16..32213cc35 100644
--- a/makefile
+++ b/makefile
@@ -77,6 +77,7 @@
 #   clean-tests
 #
 #   bootstrap-dist      Create source package with precompiled fbc sources
+#   bootstrap-dist-arm  Create source package with precompiled fbc sources for arm and aarach64 only
 #   bootstrap           Build fbc from the precompiled sources (only if precompiled sources exist)
 #   bootstrap-minimal   Build fbc from the precompiled sources (only if precompiled sources exist) with only the minimal features needed to compile another fbc
 #
@@ -1392,6 +1393,25 @@ bootstrap-dist:
 	tar -cJf "$(FBBOOTSTRAPTITLE).tar.xz" "$(FBBOOTSTRAPTITLE)"
 	rm -rf "$(FBBOOTSTRAPTITLE)"
 
+FBBOOTSTRAPTITLEARM := $(FBSOURCETITLE)-bootstrap-arm
+.PHONY: bootstrap-dist-arm
+bootstrap-dist-arm:
+	# Precompile fbc sources for various targets
+	rm -rf bootstrap
+	mkdir -p bootstrap/linux-arm
+	mkdir -p bootstrap/linux-aarch64
+	./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-arm           && mv src/compiler/*.c   bootstrap/linux-arm
+	./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-aarch64       && mv src/compiler/*.c   bootstrap/linux-aarch64
+	dos2unix bootstrap/linux-arm/*
+	dos2unix bootstrap/linux-aarch64/*
+
+	# Package FB sources (similar to our "gitdist" command), and add the bootstrap/ directory
+	# Making a .tar.xz should be good enough for now.
+	git -c core.autocrlf=false archive --format tar --prefix "$(FBBOOTSTRAPTITLEARM)/" HEAD | tar xf -
+	mv bootstrap $(FBBOOTSTRAPTITLEARM)
+	tar -cJf "$(FBBOOTSTRAPTITLEARM).tar.xz" "$(FBBOOTSTRAPTITLEARM)"
+	rm -rf "$(FBBOOTSTRAPTITLEARM)"
+
 #
 # Build the fbc[.exe] binary from the precompiled sources in the bootstrap/
 # directory.