diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 5bb656c5a2..d2934c520e 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -275,15 +275,19 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 		# files, add those, too.
 		local catalogTargets = $(target) + [ on $(target) return $(NEEDLIBS) ] ;
 		for catalogTarget in $(catalogTargets) {
-			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) ;
+			# NEEDLIBS may also contain .so files, ignore these. They will be added to the image
+			# separately
+			if $(catalogTarget:S) != .so {
+				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) ;
+				}
 			}
 		}