diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index da40f8035b..acfbb70874 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -78,9 +78,12 @@ if [ IsPackageAvailable gcc_syslibs_devel ] {
 				libgcc_eh.a: $(developLibDir)/libgcc_eh.a
 				libgcc-kernel.a: $(developLibDir)/libgcc-kernel.a
 				libgcc_eh-kernel.a: $(developLibDir)/libgcc_eh.a
+				libgcc-boot.a: $(developLibDir)/libgcc-boot.a
+				libgcc_eh-boot.a: $(developLibDir)/libgcc_eh-boot.a
 				libstdc++.a: $(developLibDir)/libstdc++.a
 				libsupc++.a: $(developLibDir)/libsupc++.a
 				libsupc++-kernel.a: $(developLibDir)/libsupc++-kernel.a
+				libsupc++-boot.a: $(developLibDir)/libsupc++-boot.a
 				c++-headers: $(developHeadersDir)/c++
 				gcc-headers: $(developHeadersDir)/gcc
 			;
diff --git a/build/jam/SystemLibraryRules b/build/jam/SystemLibraryRules
index 767b713bab..4299a164d8 100644
--- a/build/jam/SystemLibraryRules
+++ b/build/jam/SystemLibraryRules
@@ -134,6 +134,12 @@ rule TargetBootLibsupc++ asPath
 		if $(asPath) = true {
 			flags += path ;
 		}
+		if $(TARGET_PACKAGING_ARCH) = arm {
+			return [
+				BuildFeatureAttribute gcc_syslibs_devel
+					: libsupc++-boot.a : $(flags)
+			] ;
+		}
 		return [
 			BuildFeatureAttribute gcc_syslibs_devel
 				: libsupc++-kernel.a : $(flags)
@@ -246,6 +252,12 @@ rule TargetBootLibgcc architecture : asPath
 		if $(asPath) = true {
 			flags += path ;
 		}
+		if $(architecture) = arm {
+			return [
+				BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
+					: libgcc-boot.a : $(flags)
+			] ;
+		}
 		return [
 			BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
 				: libgcc-kernel.a : $(flags)