diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 357bb536d7..52a724f86c 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -271,19 +271,26 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 		$(installTargetsVar) on $(target) += $(destTarget) ;
 		TARGETS_TO_INSTALL on $(directory) += $(destTarget) ;
 
-		# If the target and its static libraries are associated with catalog
-		# files, add those, too.
-		local catalogTargets = $(target) + [ on $(target) return $(NEEDLIBS) ] ;
+		local catalogs = [ on $(target) return $(HAIKU_CATALOG_FILES) ] ;
+		if $(catalogs) {
+			local signature = [ on $(target) return $(HAIKU_CATALOG_SIGNATURE) ] ;
+			AddFilesToContainer $(container)
+				: $(systemDirTokens) data locale catalogs $(signature)
+				: $(catalogs) ;
+		}
+
+		# If the target static libraries are associated with catalog files, add those, too.
+		local catalogTargets = [ on $(target) return $(NEEDLIBS) ] ;
 		for catalogTarget in $(catalogTargets) {
-			local catalogs
-				= [ on $(catalogTarget) return $(HAIKU_CATALOG_FILES) ] ;
-			if $(catalogs) {
-				local signature
-					= [ on $(catalogTarget)
+			if $(catalogTarget:S) = .a {
+				local catalogs = [ on $(catalogTarget) return $(HAIKU_CATALOG_FILES) ] ;
+				if $(catalogs) {
+					local signature = [ on $(catalogTarget)
 						return $(HAIKU_CATALOG_SIGNATURE) ] ;
-				AddFilesToContainer $(container)
-					: $(systemDirTokens) data locale catalogs $(signature)
-					: $(catalogs) ;
+					AddFilesToContainer $(container)
+						: $(systemDirTokens) data locale catalogs $(signature)
+						: $(catalogs) ;
+				}
 			}
 		}