diff -Nru gcc-arm-none-eabi-10.3-2021.07/debian/changelog gcc-arm-none-eabi-10.3-2021.07/debian/changelog
--- gcc-arm-none-eabi-10.3-2021.07/debian/changelog	2021-11-09 02:42:32.000000000 +0000
+++ gcc-arm-none-eabi-10.3-2021.07/debian/changelog	2021-11-17 16:56:53.000000000 +0000
@@ -1,3 +1,9 @@
+gcc-arm-none-eabi (15:10.3-2021.07-4) unstable; urgency=medium
+
+  * Re-add gcc-arm-none-eabi-source package. (Closes: #999817)
+
+ -- Keith Packard <keithp@keithp.com>  Wed, 17 Nov 2021 08:56:53 -0800
+
 gcc-arm-none-eabi (15:10.3-2021.07-3) unstable; urgency=medium
 
   * Remove gcc-arm-none-eabi-source package. Why did this exist?
diff -Nru gcc-arm-none-eabi-10.3-2021.07/debian/control gcc-arm-none-eabi-10.3-2021.07/debian/control
--- gcc-arm-none-eabi-10.3-2021.07/debian/control	2021-11-09 02:42:32.000000000 +0000
+++ gcc-arm-none-eabi-10.3-2021.07/debian/control	2021-11-17 16:56:53.000000000 +0000
@@ -49,3 +49,15 @@
  Bare metal C and C++ compiler for embedded ARM chips using Cortex-M, and
  Cortex-R processors.
  This package is based on the GNU ARM toolchain provided by ARM.
+
+Package: gcc-arm-none-eabi-source
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: GCC cross compiler for ARM Cortex-R/M processors (source)
+ Bare metal C and C++ compiler for embedded ARM chips using Cortex-M, and
+ Cortex-R processors.
+ This package is based on the GNU ARM toolchain provided by ARM.
+ .
+ This package contains the sources and patches which are needed
+ to build the GNU Compiler Collection (GCC) for embedded ARM chips.
diff -Nru gcc-arm-none-eabi-10.3-2021.07/debian/gcc-arm-none-eabi-source.install gcc-arm-none-eabi-10.3-2021.07/debian/gcc-arm-none-eabi-source.install
--- gcc-arm-none-eabi-10.3-2021.07/debian/gcc-arm-none-eabi-source.install	1970-01-01 00:00:00.000000000 +0000
+++ gcc-arm-none-eabi-10.3-2021.07/debian/gcc-arm-none-eabi-source.install	2021-11-17 16:56:53.000000000 +0000
@@ -0,0 +1 @@
+usr/src
diff -Nru gcc-arm-none-eabi-10.3-2021.07/debian/rules gcc-arm-none-eabi-10.3-2021.07/debian/rules
--- gcc-arm-none-eabi-10.3-2021.07/debian/rules	2021-11-09 02:42:32.000000000 +0000
+++ gcc-arm-none-eabi-10.3-2021.07/debian/rules	2021-11-17 16:56:53.000000000 +0000
@@ -6,6 +6,7 @@
 MULTILIB_LIST="--with-multilib-list=rmprofile,aprofile"
 
 PACKAGE_GCC=gcc-arm-none-eabi
+PACKAGE_GCC_SOURCE=gcc-arm-none-eabi-source
 TARGET=arm-none-eabi
 TOP_DIR=$(shell pwd)
 
@@ -14,6 +15,7 @@
 GCC_SOURCE_DIR=$(TOP_DIR)
 GCC_DEB_TMP_DIR=$(TOP_DIR)/debian/$(PACKAGE_GCC)-tmp
 GCC_DOC_TEXI_LEGEND_DIR=$(TOP_DIR)/../texi_legend.txt
+GCC_SOURCE_DEB_TMP_DIR=$(TOP_DIR)/debian/$(PACKAGE_GCC_SOURCE)-tmp
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=-format
 BUILDFLAGS:=$(shell dpkg-buildflags --export=configure) INHIBIT_LIBC_CFLAGS="-DUSE_TM_CLONE_REGISTRY=0"
@@ -98,6 +100,9 @@
 
 override_dh_install:
 	dh_install -p$(PACKAGE_GCC) --sourcedir $(GCC_DEB_TMP_DIR)
+	mkdir -p $(GCC_SOURCE_DEB_TMP_DIR)/usr/src
+	tar --exclude=build --exclude=.git --exclude=debian --exclude=autom4te.cache --sort=name --mtime="@$(SOURCE_DATE_EPOCH)" --owner=0 --group=0 --numeric-owner --mode=0755 -C $(TOP_DIR) -c -f - . | xz -T0 > $(GCC_SOURCE_DEB_TMP_DIR)/usr/src/$(PACKAGE_GCC_SOURCE).tar.xz
+	dh_install -p$(PACKAGE_GCC_SOURCE) --sourcedir $(GCC_SOURCE_DEB_TMP_DIR)
 
 override_dh_compress:
 	dh_compress -Xexamples/