diff --git a/build/jam/packages/HaikuCrossDevel b/build/jam/packages/HaikuCrossDevel
index ba2099fcdb..5c9b553a26 100644
--- a/build/jam/packages/HaikuCrossDevel
+++ b/build/jam/packages/HaikuCrossDevel
@@ -4,9 +4,16 @@
 # The main use of this package is to provide HaikuPorter with a development
 # environment for a cross-build Haiku platform.
 
+local primaryArchitecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
 local architecture = $(TARGET_PACKAGING_ARCH) ;
 local isPrimaryArchitecture = [ MultiArchIfPrimary 1 : ] ;
 
+local packageNameSuffix = $(primaryArchitecture) ;
+local architectureSubDir ;
+if ! $(isPrimaryArchitecture) {
+	packageNameSuffix = $(primaryArchitecture)_$(architecture) ;
+	architectureSubDir = $(architecture) ;
+}
 
 local additionalLibraries_stage1 ;
 local additionalLibraries
@@ -17,10 +24,10 @@ for stage in _stage1 "" {
 	# first create the actual cross development package
 
 	local haikuCrossDevelSysrootPackage
-		= haiku_cross_devel_sysroot$(stage)_$(architecture).hpkg ;
+		= haiku_cross_devel_sysroot$(stage)_$(packageNameSuffix).hpkg ;
 	HaikuPackage $(haikuCrossDevelSysrootPackage) ;
 
-	local developCrossLibDirTokens = develop lib ;
+	local developCrossLibDirTokens = develop lib $(architectureSubDir) ;
 
 	# glue code
 	AddFilesToPackage $(developCrossLibDirTokens) :
@@ -82,8 +89,8 @@ for stage in _stage1 "" {
 	# system hierarchy of the target system, from where haikuporter will fetch
 	# it when needed.
 
-	local haikuCrossDevelPackage 
-		= haiku_cross_devel$(stage)_$(architecture).hpkg ;
+	local haikuCrossDevelPackage
+		= haiku_cross_devel$(stage)_$(packageNameSuffix).hpkg ;
 	HaikuPackage $(haikuCrossDevelPackage) ;
 
 	# add the wrapped package