diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
index 54a3ced8c9..d0dde25845 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
@@ -25,7 +25,7 @@ Addon SMTP :
 	smtp.cpp
 	md5c.c ;
 
-LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) ;
+LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
 
 if $(USE_SSL) {
 	LinkAgainst SMTP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
diff --git a/src/add-ons/media/plugins/avi_reader/Jamfile b/src/add-ons/media/plugins/avi_reader/Jamfile
index 86952e0a0f..a84971e92c 100644
--- a/src/add-ons/media/plugins/avi_reader/Jamfile
+++ b/src/add-ons/media/plugins/avi_reader/Jamfile
@@ -10,7 +10,7 @@ Addon avi_reader :
 	avi_reader.cpp
 	:
 	libopendml.a
-	be libmedia.so
+	be libmedia.so $(TARGET_LIBSTDC++)
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;
diff --git a/src/add-ons/translators/jpeg/Jamfile b/src/add-ons/translators/jpeg/Jamfile
index 5f56ef7f3d..fa262c577b 100644
--- a/src/add-ons/translators/jpeg/Jamfile
+++ b/src/add-ons/translators/jpeg/Jamfile
@@ -92,7 +92,7 @@ Translator JPEGTranslator :
 	exif_parser.cpp
 	JPEGTranslator.cpp
 
-	: be translation libjpeg.a
+	: be translation libjpeg.a $(TARGET_LIBSTDC++)
 	: true
 ;
 
diff --git a/src/apps/icon-o-matic/Jamfile b/src/apps/icon-o-matic/Jamfile
index 424cae3555..49846afa3d 100644
--- a/src/apps/icon-o-matic/Jamfile
+++ b/src/apps/icon-o-matic/Jamfile
@@ -297,7 +297,7 @@ Application Icon-O-Matic :
 	MainWindow.cpp
 	Util.cpp
 
-	: be tracker translation libshared.a libagg.a libexpat.a
+	: be tracker translation libshared.a libagg.a libexpat.a $(TARGET_LIBSTDC++)
 
 	: Icon-O-Matic.rdef
 ;
diff --git a/src/apps/installer/Jamfile b/src/apps/installer/Jamfile
index 6488f2ddae..41a2320d5e 100644
--- a/src/apps/installer/Jamfile
+++ b/src/apps/installer/Jamfile
@@ -14,5 +14,5 @@ Application Installer :
 	InstallerWindow.cpp
 	PackageViews.cpp
 	PartitionMenuItem.cpp
-	: be tracker translation
+	: be tracker translation $(TARGET_LIBSTDC++)
 	: Installer.rdef ;
diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile
index b231f78a06..039c7ac789 100644
--- a/src/kits/tracker/Jamfile
+++ b/src/kits/tracker/Jamfile
@@ -93,7 +93,7 @@ SharedLibrary libtracker.so :
 	VolumeWindow.cpp
 	WidgetAttributeText.cpp
 
-	: be translation $(vector_icon_libs)
+	: be translation $(vector_icon_libs) $(TARGET_LIBSTDC++)
 
 	;
 
diff --git a/src/preferences/appearance/Jamfile b/src/preferences/appearance/Jamfile
index 4e23f17ba8..94caee0db3 100644
--- a/src/preferences/appearance/Jamfile
+++ b/src/preferences/appearance/Jamfile
@@ -22,7 +22,7 @@ Preference Appearance :
 	#FontMenu.cpp
 	#MenuView.cpp
 	
-	: be
+	: be $(TARGET_LIBSTDC++)
 	: Appearance.rdef
 	;
 
diff --git a/src/preferences/keymap/Jamfile b/src/preferences/keymap/Jamfile
index 42bbda7054..3b9ea00293 100644
--- a/src/preferences/keymap/Jamfile
+++ b/src/preferences/keymap/Jamfile
@@ -13,6 +13,6 @@ Preference Keymap :
 	KeymapMessageFilter.cpp
 	KeymapWindow.cpp
 
-	: be tracker
+	: be tracker $(TARGET_LIBSTDC++)
 	: Keymap.rdef
 ;
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 43889619d3..620b38125d 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -63,7 +63,7 @@ Server app_server :
 	:
 	libtranslation.so libbe.so
 	libasdrawing.a libpainter.a libagg.a libfreetype.so
-	libtextencoding.so libshared.a
+	libtextencoding.so libshared.a $(TARGET_LIBSTDC++)
 
 	: app_server.rdef
 ;