diff --git a/build/jam/KernelRules b/build/jam/KernelRules
index a7ba9ea487..a86a0f135c 100644
--- a/build/jam/KernelRules
+++ b/build/jam/KernelRules
@@ -105,7 +105,7 @@ rule KernelAddon
 
 	# compile and link
 	SetupKernel $(sources) : $(TARGET_KERNEL_PIC_FLAGS) : false ;
-	local linkFlags = -nostdlib -Xlinker -soname=\"$(target)\" ;
+	local linkFlags = -nostdlib -Xlinker -soname=\"$(target:G=)\" ;
 	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
 	Main $(target) : $(sources) ;
 	LinkAgainst $(target) : $(libs) $(kernel) ;
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 00a4410909..a31a26ea45 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -116,7 +116,7 @@ rule Addon
 	
 	Main $(1) : $(3) ;
 
-	local linkFlags = -Xlinker -soname=\"$(1)\" ;
+	local linkFlags = -Xlinker -soname=\"$(1:G=)\" ;
 	if $(isExecutable) != true {
 		linkFlags = -nostart $(linkFlags) ;
 	}
@@ -282,7 +282,7 @@ rule SharedLibraryFromObjects
 
 	MainFromObjects $(_lib) : $(2) ;
 	LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ]
-						   -nostart -Xlinker -soname=\"$(_lib)\" ;
+						   -nostart -Xlinker -soname=\"$(_lib:G=)\" ;
 	LinkAgainst $(_lib) : $(3) ;
 
 	AddSharedObjectGlueCode $(_lib) : false ;
@@ -464,7 +464,7 @@ rule BuildPlatformSharedLibrary
 	
 	BuildPlatformMain $(target) : $(sources) : $(libs) ;
 	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
-		-shared -Xlinker -soname=\"$(target)\" ;
+		-shared -Xlinker -soname=\"$(target:G=)\" ;
 }
 
 rule BuildPlatformMergeObject