diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index e980e5485f..a9c2dc432a 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -623,7 +623,12 @@ HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ;
 HOST_RM_ATTRS_TARGET = ;
 
 if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
-	HOST_LIBSTDC++ = stdc++.r4 ;
+	if $(HOST_GCC_VERSION[1]) < 3 {
+		HOST_LIBSTDC++ = stdc++.r4 ;
+	} else {
+		HOST_LIBSTDC++ = stdc++ ;
+	}
+
 	HOST_LIBROOT = root ;
 	HOST_STATIC_LIBROOT = $(HOST_LIBROOT) ;
 	HOST_LIBBE = be ;