diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 8167199bc1..1736ab9b84 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -198,6 +198,8 @@ rule ArchitectureSetup architecture
 	}
 	HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
 		= <$(architecture)>liblocalestub.a ;
+	HAIKU_LIBRARY_NAME_MAP_$(architecture)_shared
+		= <$(architecture)>libshared.a ;
 	if $(architecture) = $(HAIKU_PACKAGING_ARCHS[1]) {
 		HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
 			= <nogrist>input_server ;
diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index de160cdb6f..6bdee11149 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -39,7 +39,7 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 
 # static libraries
 AddFilesToPackage develop lib : libcolumnlistview.a
-	<$(architecture)>liblocalestub.a libshared.a ;
+	<$(architecture)>liblocalestub.a <$(architecture)>libshared.a ;
 
 # the POSIX error code mapper library
 AddFilesToPackage develop lib : libposix_error_mapper.a ;
diff --git a/src/add-ons/disk_systems/bfs/Jamfile b/src/add-ons/disk_systems/bfs/Jamfile
index 4eb777bd54..ab2dc423db 100644
--- a/src/add-ons/disk_systems/bfs/Jamfile
+++ b/src/add-ons/disk_systems/bfs/Jamfile
@@ -13,7 +13,7 @@ Addon <disk_system>bfs :
 
 	bfs_disk_system.cpp
 
-	: be localestub [ TargetLibsupc++ ] libshared.a
+	: be localestub [ TargetLibsupc++ ] shared
 ;
 
 DoCatalogs <disk_system>bfs :
diff --git a/src/add-ons/disk_systems/fat/Jamfile b/src/add-ons/disk_systems/fat/Jamfile
index 11e20a4081..52fc02939c 100644
--- a/src/add-ons/disk_systems/fat/Jamfile
+++ b/src/add-ons/disk_systems/fat/Jamfile
@@ -11,7 +11,7 @@ Addon <disk_system>fat :
 	FATAddOn.cpp
 	InitializeParameterEditor.cpp
 
-	: be localestub [ TargetLibsupc++ ] libshared.a
+	: be localestub [ TargetLibsupc++ ] shared
 ;
 
 DoCatalogs <disk_system>fat :
diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile
index 097985aaad..deeeaf93d7 100644
--- a/src/add-ons/disk_systems/intel/Jamfile
+++ b/src/add-ons/disk_systems/intel/Jamfile
@@ -23,7 +23,7 @@ Addon <disk_system>intel :
 	# kernel sources
 	PartitionMap.cpp
 
-	: be libshared.a localestub [ TargetLibsupc++ ]
+	: be shared localestub [ TargetLibsupc++ ]
 ;
 
 DoCatalogs <disk_system>intel :
diff --git a/src/add-ons/disk_systems/ntfs/Jamfile b/src/add-ons/disk_systems/ntfs/Jamfile
index c6e675abe7..9d48f9c458 100644
--- a/src/add-ons/disk_systems/ntfs/Jamfile
+++ b/src/add-ons/disk_systems/ntfs/Jamfile
@@ -11,7 +11,7 @@ Addon <disk_system>ntfs :
 	NTFSAddOn.cpp
 	InitializeParameterEditor.cpp
 
-	: be localestub [ TargetLibsupc++ ] libshared.a
+	: be localestub [ TargetLibsupc++ ] shared
 ;
 
 DoCatalogs <disk_system>ntfs :
diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile
index 0fc8cb2893..7823dafa0b 100644
--- a/src/add-ons/input_server/devices/keyboard/Jamfile
+++ b/src/add-ons/input_server/devices/keyboard/Jamfile
@@ -14,7 +14,7 @@ Addon <input>keyboard :
 	TeamMonitorWindow.cpp
 	TeamListItem.cpp
 
-	: input_server be libshared.a localestub [ TargetLibsupc++ ] ;
+	: input_server be shared localestub [ TargetLibsupc++ ] ;
 
 DoCatalogs <input>keyboard :
 	x-vnd.Haiku-KeyboardInputServerDevice
diff --git a/src/add-ons/input_server/devices/virtualkeyboard/Jamfile b/src/add-ons/input_server/devices/virtualkeyboard/Jamfile
index a11c6da584..74d6b6dd85 100644
--- a/src/add-ons/input_server/devices/virtualkeyboard/Jamfile
+++ b/src/add-ons/input_server/devices/virtualkeyboard/Jamfile
@@ -14,6 +14,6 @@ Addon <input>virtualkeyboard :
 	VirtualKeyboardInputDevice.cpp
 	VirtualKeyboardWindow.cpp
 
-	: be tracker input_server localestub libshared.a $(TARGET_LIBSTDC++)
+	: be tracker input_server localestub shared $(TARGET_LIBSTDC++)
 ;
 
diff --git a/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile b/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile
index 1399974491..bf026cbf87 100644
--- a/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile
+++ b/src/add-ons/kernel/file_systems/netfs/authentication_server/Jamfile
@@ -20,6 +20,6 @@ Application authentication_server
 	  AuthenticationPanel.cpp
 	  AuthenticationServer.cpp
 	  Panel.cpp
-	: be [ TargetLibsupc++ ] libshared.a
+	: be [ TargetLibsupc++ ] shared
 	: authentication_server.rdef
 ;
diff --git a/src/add-ons/kernel/file_systems/netfs/client/Jamfile b/src/add-ons/kernel/file_systems/netfs/client/Jamfile
index 2d97577abe..1cb18415c4 100644
--- a/src/add-ons/kernel/file_systems/netfs/client/Jamfile
+++ b/src/add-ons/kernel/file_systems/netfs/client/Jamfile
@@ -88,5 +88,5 @@ Addon netfs
 	  VolumeManager.cpp
 
 	: be libuserlandfs_beos_kernel.so
-	  $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
+	  $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] shared
 ;
diff --git a/src/add-ons/kernel/file_systems/netfs/server/Jamfile b/src/add-ons/kernel/file_systems/netfs/server/Jamfile
index 6c9ca6d6f2..5860eb3c62 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/Jamfile
+++ b/src/add-ons/kernel/file_systems/netfs/server/Jamfile
@@ -84,7 +84,7 @@ Application netfs_server
 	Volume.cpp
 	VolumeManager.cpp
 	:
-	be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] libshared.a
+	be $(TARGET_NETWORK_LIBS) [ TargetLibsupc++ ] shared
 	:
 	netfs_server.rdef
 ;
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile
index 61badfa7f1..dff868228f 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile
@@ -29,5 +29,5 @@ SharedLibrary libuserlandfs_fuse.so
 	FUSEVolume.cpp
 
 	:
-	<nogrist>userlandfs_server libshared.a be [ TargetLibsupc++ ]
+	<nogrist>userlandfs_server shared be [ TargetLibsupc++ ]
 ;
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index 1dc3455b5a..68a7c76775 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -45,7 +45,7 @@ Addon IMAP
 	$(sources)
 	:
 	be libmail.so localestub $(TARGET_NETWORK_LIBS) libbnetapi.so
-	libshared.a [ TargetLibsupc++ ] [ TargetLibstdc++ ]
+	shared [ TargetLibsupc++ ] [ TargetLibstdc++ ]
 ;
 
 SEARCH on [ FGristFiles Commands.cpp Protocol.cpp Response.cpp ]
diff --git a/src/add-ons/network_settings/ftpd/Jamfile b/src/add-ons/network_settings/ftpd/Jamfile
index c774f59423..cf0cc562cc 100644
--- a/src/add-ons/network_settings/ftpd/Jamfile
+++ b/src/add-ons/network_settings/ftpd/Jamfile
@@ -9,7 +9,7 @@ AddResources FTPService : FTPService.rdef ;
 Addon FTPService :
 	FTPServiceAddOn.cpp
 
-	: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
+	: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
 		[ TargetLibstdc++ ] localestub
 ;
 
diff --git a/src/add-ons/network_settings/ipv4/Jamfile b/src/add-ons/network_settings/ipv4/Jamfile
index e8d9c86433..7a081769b3 100644
--- a/src/add-ons/network_settings/ipv4/Jamfile
+++ b/src/add-ons/network_settings/ipv4/Jamfile
@@ -9,7 +9,7 @@ AddResources IPv4Interface : IPv4Interface.rdef ;
 Addon IPv4Interface :
 	IPv4InterfaceAddOn.cpp
 
-	: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
+	: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
 		[ TargetLibstdc++ ] localestub
 ;
 
diff --git a/src/add-ons/network_settings/ipv6/Jamfile b/src/add-ons/network_settings/ipv6/Jamfile
index 53df2c986b..e97e196e0f 100644
--- a/src/add-ons/network_settings/ipv6/Jamfile
+++ b/src/add-ons/network_settings/ipv6/Jamfile
@@ -11,7 +11,7 @@ AddResources IPv6Interface : IPv6Interface.rdef ;
 Addon IPv6Interface :
 	IPv6InterfaceAddOn.cpp
 
-	: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
+	: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
 		[ TargetLibstdc++ ] localestub
 ;
 
diff --git a/src/add-ons/network_settings/sshd/Jamfile b/src/add-ons/network_settings/sshd/Jamfile
index d0bf64e75a..85d7cefca6 100644
--- a/src/add-ons/network_settings/sshd/Jamfile
+++ b/src/add-ons/network_settings/sshd/Jamfile
@@ -9,7 +9,7 @@ AddResources SSHService : SSHService.rdef ;
 Addon SSHService :
 	SSHServiceAddOn.cpp
 
-	: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
+	: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
 		[ TargetLibstdc++ ] localestub
 ;
 
diff --git a/src/add-ons/network_settings/telnetd/Jamfile b/src/add-ons/network_settings/telnetd/Jamfile
index ffdf578d05..4f37462cac 100644
--- a/src/add-ons/network_settings/telnetd/Jamfile
+++ b/src/add-ons/network_settings/telnetd/Jamfile
@@ -9,7 +9,7 @@ AddResources TelnetService : TelnetService.rdef ;
 Addon TelnetService :
 	TelnetServiceAddOn.cpp
 
-	: be bnetapi libshared.a <nogrist>Network [ TargetLibsupc++ ]
+	: be bnetapi shared <nogrist>Network [ TargetLibsupc++ ]
 		[ TargetLibstdc++ ] localestub
 ;
 
diff --git a/src/add-ons/print/transports/ipp/Jamfile b/src/add-ons/print/transports/ipp/Jamfile
index a9013ea6a6..d5e7aecae7 100644
--- a/src/add-ons/print/transports/ipp/Jamfile
+++ b/src/add-ons/print/transports/ipp/Jamfile
@@ -17,7 +17,7 @@ Addon IPP :
 	Socket.o
 	SocketStream.o
 	DbgMsg.o
-	: libshared.a be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
+	: shared be $(TARGET_NETAPI_LIB) $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
 ;
 
 ObjectReferences
diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile
index 30008f61e5..f9c80981d4 100644
--- a/src/add-ons/print/transports/usb_port/Jamfile
+++ b/src/add-ons/print/transports/usb_port/Jamfile
@@ -9,5 +9,5 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ;
 Addon USB\ Port :
 	USBTransport.cpp
 	PrintTransportAddOn.cpp
-	: libshared.a libdevice.so be [ TargetLibsupc++ ]
+	: shared libdevice.so be [ TargetLibsupc++ ]
 ;
diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile
index 6a3a7d0cea..86ef52c8ff 100644
--- a/src/apps/activitymonitor/Jamfile
+++ b/src/apps/activitymonitor/Jamfile
@@ -10,7 +10,7 @@ Application ActivityMonitor :
 	SettingsWindow.cpp
 	SystemInfo.cpp
 	SystemInfoHandler.cpp
-	: be tracker media libbnetapi.so libshared.a [ TargetLibstdc++ ]
+	: be tracker media libbnetapi.so shared [ TargetLibstdc++ ]
 		$(TARGET_NETWORK_LIBS) localestub
 	: ActivityMonitor.rdef
 	;
diff --git a/src/apps/debuganalyzer/Jamfile b/src/apps/debuganalyzer/Jamfile
index 6821468a29..ded6182899 100644
--- a/src/apps/debuganalyzer/Jamfile
+++ b/src/apps/debuganalyzer/Jamfile
@@ -27,7 +27,7 @@ Application DebugAnalyzer
 	<nogrist>DebugAnalyzer_model_loader.o
 	<nogrist>DebugAnalyzer_util.o
 
-	libcolumnlistview.a libshared.a libdebug.so be
+	libcolumnlistview.a shared libdebug.so be
 	[ TargetLibstdc++ ]
 	:
 	DebugAnalyzer.rdef
diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 3e9e88618f..cc075c36f6 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -415,7 +415,7 @@ Application Debugger :
 	libudis86.a
 	<bin>debug_utils.a
 	libcolumnlistview.a
-	libshared.a
+	shared
 
 	[ TargetLibstdc++ ]
 	be package tracker libbsd.so libdebug.so
diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile
index e290be5e96..5f97856b81 100644
--- a/src/apps/deskbar/Jamfile
+++ b/src/apps/deskbar/Jamfile
@@ -14,7 +14,7 @@ SubDirC++Flags -DDB_ADDONS
 local targetLib ;
 local targetSource ;
 
-targetLib = libshared.a ;
+targetLib = shared ;
 targetSource = CalendarMenuWindow.cpp ;
 SubDirC++Flags -D_SHOW_CALENDAR_MENU_WINDOW=1 -DMOUNT_MENU_IN_DESKBAR=1 ;
 
diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile
index 5de3aaa52e..851e36c53d 100644
--- a/src/apps/deskcalc/Jamfile
+++ b/src/apps/deskcalc/Jamfile
@@ -13,7 +13,7 @@ Application DeskCalc :
 	ExpressionTextView.cpp
 	InputTextView.cpp
 	: be [ TargetLibstdc++ ] localestub media libexpression_parser.a
-		libmapm.a libshared.a
+		libmapm.a shared
 	: DeskCalc.rdef
 ;
 
diff --git a/src/apps/diskusage/Jamfile b/src/apps/diskusage/Jamfile
index 60402c5f9b..294ec938de 100644
--- a/src/apps/diskusage/Jamfile
+++ b/src/apps/diskusage/Jamfile
@@ -14,7 +14,7 @@ Application DiskUsage :
 	Snapshot.cpp
 	StatusView.cpp
 	VolumeView.cpp
-	: be libshared.a localestub [ TargetLibstdc++ ]
+	: be shared localestub [ TargetLibstdc++ ]
 	: DiskUsage.rdef
 ;
 
diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile
index 5aff25719f..7343b1dcca 100644
--- a/src/apps/drivesetup/Jamfile
+++ b/src/apps/drivesetup/Jamfile
@@ -15,7 +15,7 @@ Preference DriveSetup :
 	PartitionList.cpp
 	Support.cpp
 
-	: be localestub libcolumnlistview.a libshared.a
+	: be localestub libcolumnlistview.a shared
 		[ TargetLibsupc++ ]
 	: DriveSetup.rdef
 ;
diff --git a/src/apps/firstbootprompt/Jamfile b/src/apps/firstbootprompt/Jamfile
index 9c73a2cf23..615cbe2829 100644
--- a/src/apps/firstbootprompt/Jamfile
+++ b/src/apps/firstbootprompt/Jamfile
@@ -9,7 +9,7 @@ Application FirstBootPrompt :
 	BootPromptWindow.cpp
 	Keymap.cpp
 	KeymapListItem.cpp
-	: be translation libshared.a [ TargetLibstdc++ ] localestub
+	: be translation shared [ TargetLibstdc++ ] localestub
 	: BootPrompt.rdef
 ;
 
diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 315e8d1574..30cc734b84 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -81,7 +81,7 @@ Application HaikuDepot :
 	# text view stuff
 	$(textDocumentSources)
 
-	: be package bnetapi translation libcolumnlistview.a libshared.a
+	: be package bnetapi translation libcolumnlistview.a shared
 		[ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub
 	: HaikuDepot.rdef
 ;
@@ -107,5 +107,5 @@ Application TextDocumentTest :
 	TextDocumentTest.cpp
 	$(textDocumentSources)
 
-	: be translation libshared.a [ TargetLibsupc++ ]
+	: be translation shared [ TargetLibsupc++ ]
 ;
diff --git a/src/apps/icon-o-matic/Jamfile b/src/apps/icon-o-matic/Jamfile
index 9e91542793..3f5b85e5ce 100644
--- a/src/apps/icon-o-matic/Jamfile
+++ b/src/apps/icon-o-matic/Jamfile
@@ -298,7 +298,7 @@ Application Icon-O-Matic :
 	MainWindow.cpp
 	Util.cpp
 
-	: be tracker translation libshared.a libagg.a
+	: be tracker translation shared libagg.a
 		[ BuildFeatureAttribute expat : library ]
 		[ TargetLibstdc++ ] localestub
 
diff --git a/src/apps/installer/Jamfile b/src/apps/installer/Jamfile
index 71e02303fe..b961a814d7 100644
--- a/src/apps/installer/Jamfile
+++ b/src/apps/installer/Jamfile
@@ -21,7 +21,7 @@ Application Installer :
 	# From launch_daemon
 	Utility.cpp
 
-	: be tracker translation libshared.a [ TargetLibstdc++ ]
+	: be tracker translation shared [ TargetLibstdc++ ]
 		localestub
 	: Installer.rdef
 ;
diff --git a/src/apps/launchbox/Jamfile b/src/apps/launchbox/Jamfile
index 8d03f3e90d..850d9d2bfe 100644
--- a/src/apps/launchbox/Jamfile
+++ b/src/apps/launchbox/Jamfile
@@ -11,7 +11,7 @@ Application LaunchBox :
 	PadView.cpp
 	Panel.cpp
 	support.cpp
-	: be translation libshared.a [ TargetLibsupc++ ] localestub
+	: be translation shared [ TargetLibsupc++ ] localestub
 	: LaunchBox.rdef
 ;
 
diff --git a/src/apps/mail/Jamfile b/src/apps/mail/Jamfile
index 202f9afb9a..9964fe3189 100644
--- a/src/apps/mail/Jamfile
+++ b/src/apps/mail/Jamfile
@@ -41,7 +41,7 @@ Application Mail :
 	AutoCompleterDefaultImpl.cpp
 	TextViewCompleter.cpp
 
-	: libshared.a be tracker [ TargetLibstdc++ ] [ TargetLibsupc++ ]
+	: shared be tracker [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 		localestub libmail.so libtextencoding.so
 	: Mail.rdef
 ;
diff --git a/src/apps/mediaplayer/Jamfile b/src/apps/mediaplayer/Jamfile
index 68d4c329ba..296a860b32 100644
--- a/src/apps/mediaplayer/Jamfile
+++ b/src/apps/mediaplayer/Jamfile
@@ -114,7 +114,7 @@ Application MediaPlayer :
 	VideoView.cpp
 
 	: be game media tracker translation textencoding [ TargetLibstdc++ ]
-		localestub libshared.a
+		localestub shared
 	: MediaPlayer.rdef
 ;
 
diff --git a/src/apps/musiccollection/Jamfile b/src/apps/musiccollection/Jamfile
index 0960aa0e62..deff5e3f59 100644
--- a/src/apps/musiccollection/Jamfile
+++ b/src/apps/musiccollection/Jamfile
@@ -13,7 +13,7 @@ Application MusicCollection :
 	NodeMonitorHandler.cpp
 	:
 	be libalm.so localestub [ TargetLibsupc++ ]
-	[ TargetLibstdc++ ] libshared.a
+	[ TargetLibstdc++ ] shared
 	:
 	MusicCollection.rdef
 	;
diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile
index 9fb885b05f..992abc4c6a 100644
--- a/src/apps/networkstatus/Jamfile
+++ b/src/apps/networkstatus/Jamfile
@@ -17,7 +17,7 @@ Application NetworkStatus :
 	RadioView.cpp
 	WirelessNetworkMenuItem.cpp
 
-	: be libshared.a localestub $(icon_libs) $(TARGET_NETWORK_LIBS)
+	: be shared localestub $(icon_libs) $(TARGET_NETWORK_LIBS)
 		libbnetapi.so [ TargetLibstdc++ ]
 	: NetworkStatus.rdef NetworkStatusIcons.rdef
 ;
diff --git a/src/apps/powerstatus/Jamfile b/src/apps/powerstatus/Jamfile
index 7063bcfb26..017c9c7ea4 100644
--- a/src/apps/powerstatus/Jamfile
+++ b/src/apps/powerstatus/Jamfile
@@ -13,7 +13,7 @@ Application PowerStatus :
 	PowerStatusWindow.cpp
 	PowerStatusView.cpp
 	PowerStatus.cpp
-	: be translation libshared.a [ TargetLibsupc++ ] localestub
+	: be translation shared [ TargetLibsupc++ ] localestub
 	: PowerStatus.rdef
 ;
 DoCatalogs PowerStatus :
diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile
index 00bdc8221e..a189b088cb 100644
--- a/src/apps/processcontroller/Jamfile
+++ b/src/apps/processcontroller/Jamfile
@@ -21,7 +21,7 @@ Application ProcessController :
 	ThreadBarMenu.cpp
 	ThreadBarMenuItem.cpp
 	Utilities.cpp
-	: be libshared.a [ TargetLibsupc++ ] localestub
+	: be shared [ TargetLibsupc++ ] localestub
 	: ProcessController.rdef
 ;
 
diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile
index f058075b7c..e49f448df8 100644
--- a/src/apps/showimage/Jamfile
+++ b/src/apps/showimage/Jamfile
@@ -20,7 +20,7 @@ Application ShowImage :
 	ShowImageView.cpp
 	ShowImageWindow.cpp
 	ToolBarIcons.cpp
-	: libshared.a be tracker translation localestub
+	: shared be tracker translation localestub
 		[ TargetLibstdc++ ] [ TargetLibsupc++ ]
 	: ShowImage.rdef
 ;
diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile
index 789cca7ee4..23bfb2c671 100644
--- a/src/apps/stylededit/Jamfile
+++ b/src/apps/stylededit/Jamfile
@@ -22,7 +22,7 @@ Application StyledEdit :
 	StyledEditApp.cpp
 	StyledEditView.cpp
 	StyledEditWindow.cpp
-	: libshared.a be translation tracker libtextencoding.so localestub
+	: shared be translation tracker libtextencoding.so localestub
 		[ TargetLibsupc++ ]
 	: $(styled_edit_rsrc)
 	;
diff --git a/src/apps/switcher/Jamfile b/src/apps/switcher/Jamfile
index 8bfd1b271a..6655bbb2d4 100644
--- a/src/apps/switcher/Jamfile
+++ b/src/apps/switcher/Jamfile
@@ -12,6 +12,6 @@ Application Switcher :
 	WindowsView.cpp
 
 	: be translation [ TargetLibstdc++ ] [ TargetLibsupc++ ]
-		localestub libshared.a
+		localestub shared
 	: Switcher.rdef
 ;
diff --git a/src/apps/text_search/Jamfile b/src/apps/text_search/Jamfile
index 9c0b8e4a50..91369a6a90 100644
--- a/src/apps/text_search/Jamfile
+++ b/src/apps/text_search/Jamfile
@@ -24,7 +24,7 @@ Application TextSearch :
 
 	$(additionalBeOSSources)
 
-	: be localestub tracker textencoding libshared.a
+	: be localestub tracker textencoding shared
 		[ TargetLibsupc++ ]
 	: TextSearch.rdef
 ;
diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile
index 6cbfbadb92..f06ac60a07 100644
--- a/src/apps/webpositive/Jamfile
+++ b/src/apps/webpositive/Jamfile
@@ -73,8 +73,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			$(sources)
 			:
 			[ BuildFeatureAttribute webkit : libraries ]
-			[ TargetLibstdc++ ] localestub
-			[ MultiArchDefaultGristFiles libshared.a ]
+			[ TargetLibstdc++ ] localestub shared
 			[ MultiArchDefaultGristFiles libcolumnlistview.a ]
 			be network bnetapi tracker translation
 			:
diff --git a/src/apps/workspaces/Jamfile b/src/apps/workspaces/Jamfile
index 0af2fc682b..08dac997aa 100644
--- a/src/apps/workspaces/Jamfile
+++ b/src/apps/workspaces/Jamfile
@@ -7,7 +7,7 @@ UsePrivateHeaders app interface shared ;
 
 Application Workspaces :
 	Workspaces.cpp 
-	: be libshared.a localestub [ TargetLibsupc++ ]
+	: be shared localestub [ TargetLibsupc++ ]
 	: Workspaces.rdef 
 	;
 
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 6aae7b68d0..db4534eb0b 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -132,7 +132,7 @@ StdBinCommands
 # standard commands that need libbe.so, libsupc++.so, and libshared.a
 StdBinCommands
 	ramdisk.cpp
-	: libshared.a be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ;
+	: shared be [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ;
 
 # standard commands that need libbe.so, libbnetapi.solibsupc++.so
 StdBinCommands
diff --git a/src/bin/consoled/Jamfile b/src/bin/consoled/Jamfile
index d900f70a74..fb3edb9242 100644
--- a/src/bin/consoled/Jamfile
+++ b/src/bin/consoled/Jamfile
@@ -5,5 +5,5 @@ UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
 
 Application consoled :
 	consoled.cpp
-	: be libshared.a [ TargetLibsupc++ ]
+	: be shared [ TargetLibsupc++ ]
 ;
diff --git a/src/bin/keymap/Jamfile b/src/bin/keymap/Jamfile
index aaaede1824..d6551adec6 100644
--- a/src/bin/keymap/Jamfile
+++ b/src/bin/keymap/Jamfile
@@ -6,5 +6,5 @@ UsePrivateHeaders shared storage ;
 BinCommand keymap :
 	main.cpp
 	Keymap.cpp
-	: be libshared.a [ TargetLibsupc++ ]
+	: be shared [ TargetLibsupc++ ]
 	: keymap.rdef ;
diff --git a/src/bin/pkgman/Jamfile b/src/bin/pkgman/Jamfile
index 127fdb23e2..8a68af8868 100644
--- a/src/bin/pkgman/Jamfile
+++ b/src/bin/pkgman/Jamfile
@@ -20,6 +20,6 @@ BinCommand pkgman :
 	PackageManager.cpp
 	pkgman.cpp
 	:
-	libshared.a package be
+	shared package be
 	[ TargetLibsupc++ ] [ TargetLibstdc++ ]
 ;
diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile
index 561005e328..df317a49b0 100644
--- a/src/kits/interface/Jamfile
+++ b/src/kits/interface/Jamfile
@@ -155,7 +155,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			OneElementLayouter.cpp
 			SimpleLayouter.cpp
 
-			: [ MultiArchDefaultGristFiles libshared.a ]
+			: <$(architecture)>libshared.a
 			;
 
 		StaticLibrary [ MultiArchDefaultGristFiles libcolumnlistview.a ] :
diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile
index 1c1fba91e7..a1c7e2fc6d 100644
--- a/src/kits/mail/Jamfile
+++ b/src/kits/mail/Jamfile
@@ -58,8 +58,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		SharedLibrary $(libmail) :
 			$(sources)
 			:
-			be bnetapi textencoding tracker 
-			[ MultiArchDefaultGristFiles libshared.a ]
+			be bnetapi textencoding tracker shared
 			[ TargetLibstdc++ ]
 			$(TARGET_NETWORK_LIBS)
 			$(TARGET_SELECT_UNAME_ETC_LIB)
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 3220ec6ed0..aef88691d9 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -101,10 +101,9 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			UrlSynchronousRequest.cpp
 
 			:
-			be $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ]
-			[ BuildFeatureAttribute openssl : libraries ]
+			be shared $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ]
+			[ TargetLibsupc++ ] [ BuildFeatureAttribute openssl : libraries ]
 			[ BuildFeatureAttribute icu : libraries ]
-			[ MultiArchDefaultGristFiles libshared.a ]
 			;
 	}
 }
diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile
index 787baf6518..013c9ee037 100644
--- a/src/kits/package/Jamfile
+++ b/src/kits/package/Jamfile
@@ -128,7 +128,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			SolverRepository.cpp
 			SolverResult.cpp
 			:
-			[ MultiArchDefaultGristFiles libshared.a ]
+			shared
 			be
 			[ BuildFeatureAttribute curl : library ]
 			[ TargetLibstdc++ ]
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index a5a2daebb7..8b3dfc9c1f 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -26,7 +26,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		UsePrivateSystemHeaders ;
 		UsePrivateHeaders kernel libroot ;
 
-		StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
+		StaticLibrary <$(architecture)>libshared.a :
 			AboutMenuItem.cpp
 			ArgumentVector.cpp
 			AttributeUtilities.cpp
diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile
index 6f05dcc3ca..5624c3d1c4 100644
--- a/src/kits/tracker/Jamfile
+++ b/src/kits/tracker/Jamfile
@@ -100,9 +100,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			WidgetAttributeText.cpp
 
 			:
-			be localestub translation $(vectorIconLibs)
+			be localestub shared translation $(vectorIconLibs)
 			[ TargetLibstdc++ ] [ TargetLibsupc++ ]
-			[ MultiArchDefaultGristFiles libshared.a ]
 			[ MultiArchDefaultGristFiles libshortcuts_shared.a ]
 			;
 	}
diff --git a/src/preferences/datatranslations/Jamfile b/src/preferences/datatranslations/Jamfile
index 8c2ef905db..8ab411d34d 100644
--- a/src/preferences/datatranslations/Jamfile
+++ b/src/preferences/datatranslations/Jamfile
@@ -10,7 +10,7 @@ Preference DataTranslations :
 	DataTranslationsSettings.cpp
 	TranslatorListView.cpp
 
-	: be translation [ TargetLibsupc++ ] localestub libshared.a
+	: be translation [ TargetLibsupc++ ] localestub shared
 	: DataTranslations.rdef
 	;
 
diff --git a/src/preferences/keymap/Jamfile b/src/preferences/keymap/Jamfile
index a342714434..d6761c5c21 100644
--- a/src/preferences/keymap/Jamfile
+++ b/src/preferences/keymap/Jamfile
@@ -21,7 +21,7 @@ Preference Keymap :
 	KeymapWindow.cpp
 	ModifierKeysWindow.cpp
 
-	: be tracker localestub libshared.a [ TargetLibstdc++ ]
+	: be tracker localestub shared [ TargetLibstdc++ ]
 	: Keymap.rdef
 ;
 
diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile
index 9e2d7e93ec..55c6d0dad9 100644
--- a/src/preferences/locale/Jamfile
+++ b/src/preferences/locale/Jamfile
@@ -11,7 +11,7 @@ local sources =
 
 Preference Locale
 	: $(sources)
-	: be [ TargetLibstdc++ ] [ TargetLibsupc++ ] libshared.a
+	: be [ TargetLibstdc++ ] [ TargetLibsupc++ ] shared
 		localestub
 	: Locale.rdef
 ;
diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile
index acbd1df906..532057c787 100644
--- a/src/preferences/network/Jamfile
+++ b/src/preferences/network/Jamfile
@@ -27,7 +27,7 @@ Preference Network :
 	# from ifconfig
 	MediaTypes.cpp
 
-	: be bnetapi libshared.a [ TargetLibstdc++ ] localestub
+	: be bnetapi shared [ TargetLibstdc++ ] localestub
 	: Network.rdef InterfaceIcons.rdef
 ;
 
diff --git a/src/preferences/time/Jamfile b/src/preferences/time/Jamfile
index fc0d2cf1e0..291dde2295 100644
--- a/src/preferences/time/Jamfile
+++ b/src/preferences/time/Jamfile
@@ -32,7 +32,7 @@ Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute icu : headers ] ;
 
 Preference Time
 	: $(sources)
-	: be libshared.a [ TargetLibstdc++ ] localestub $(HAIKU_NETWORK_LIBS)
+	: be shared [ TargetLibstdc++ ] localestub $(HAIKU_NETWORK_LIBS)
 	: Time.rdef
 	;
 
diff --git a/src/preferences/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile
index 259afb54fb..df38e7582a 100644
--- a/src/preferences/virtualmemory/Jamfile
+++ b/src/preferences/virtualmemory/Jamfile
@@ -8,7 +8,7 @@ Preference VirtualMemory :
 	Settings.cpp
 	$(DRIVER_SETTINGS)
 
-	: be libshared.a [ TargetLibstdc++ ] localestub
+	: be shared [ TargetLibstdc++ ] localestub
 	: VirtualMemory.rdef
 ;
 
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index aaef69de94..8f567abe2e 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -103,7 +103,7 @@ Server app_server :
 	libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
 	libasdrawing.a libpainter.a libagg.a
 	[ BuildFeatureAttribute freetype : library ]
-	libstackandtile.a liblinprog.a libtextencoding.so libshared.a
+	libstackandtile.a liblinprog.a libtextencoding.so shared
 	[ TargetLibstdc++ ]
 
 	: app_server.rdef
diff --git a/src/servers/debug/Jamfile b/src/servers/debug/Jamfile
index 71ba507842..ac4d06e834 100644
--- a/src/servers/debug/Jamfile
+++ b/src/servers/debug/Jamfile
@@ -14,7 +14,7 @@ Server debug_server
 	:
 	be
 	libdebug.so
-	libshared.a
+	shared
 	[ TargetLibstdc++ ]
 	localestub
 ;
diff --git a/src/servers/launch/Jamfile b/src/servers/launch/Jamfile
index a6e7a3d57f..db2c7921c8 100644
--- a/src/servers/launch/Jamfile
+++ b/src/servers/launch/Jamfile
@@ -26,7 +26,7 @@ Server launch_daemon
 	InitSharedMemoryDirectoryJob.cpp
 	InitTemporaryDirectoryJob.cpp
 	:
-	be network bnetapi libshared.a libmultiuser_utils.a [ TargetLibstdc++ ]
+	be network bnetapi shared libmultiuser_utils.a [ TargetLibstdc++ ]
 	:
 	LaunchDaemon.rdef
 ;
diff --git a/src/servers/midi/Jamfile b/src/servers/midi/Jamfile
index 4a503bbc12..09085a82df 100644
--- a/src/servers/midi/Jamfile
+++ b/src/servers/midi/Jamfile
@@ -12,7 +12,7 @@ Server midi_server :
 	# storage
 	NodeMonitorHandler.cpp
 
-	: be midi2 libshared.a libicon.a [ TargetLibstdc++ ]
+	: be midi2 shared libicon.a [ TargetLibstdc++ ]
 	: midi_server.rdef
 ;
 
diff --git a/src/servers/net/Jamfile b/src/servers/net/Jamfile
index 0a393f121f..3d269099f7 100644
--- a/src/servers/net/Jamfile
+++ b/src/servers/net/Jamfile
@@ -24,7 +24,7 @@ Server net_server :
 	DHCPClient.cpp
 	Services.cpp
 
-	: be network bnetapi [ TargetLibstdc++ ] libshared.a
+	: be network bnetapi [ TargetLibstdc++ ] shared
 	# for PPP
 	#libppp.a
 ;
diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
index 1db35ad281..af26aec061 100644
--- a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
@@ -5,11 +5,11 @@ UsePrivateHeaders shared ;
 SimpleTest generate_hashs :
 	generate_hashs.cpp
 	AdaptiveBuffering.cpp
-	: be [ TargetLibstdc++ ] libshared.a
+	: be [ TargetLibstdc++ ] shared
 ;
 
 SimpleTest consistency_check :
 	consistency_check.cpp
 	AdaptiveBuffering.cpp
-	: be [ TargetLibstdc++ ] libshared.a
+	: be [ TargetLibstdc++ ] shared
 ;
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 2e7c888a51..732c19e323 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -172,7 +172,7 @@ SharedLibrary libtestappserver.so :
 	WorkspacesView.cpp
 
 	# libraries
-	: be libpainter.a libagg.a libtextencoding.so libshared.a libstackandtile.a
+	: be libpainter.a libagg.a libtextencoding.so shared libstackandtile.a
 	liblinprog.a
 	[ BuildFeatureAttribute freetype : library ]
 ;
diff --git a/src/tests/servers/launch/Jamfile b/src/tests/servers/launch/Jamfile
index 884ad6fbfa..401f7994cb 100644
--- a/src/tests/servers/launch/Jamfile
+++ b/src/tests/servers/launch/Jamfile
@@ -19,5 +19,5 @@ UnitTestLib liblaunch_daemontest.so :
 	Conditions.cpp
 	Utility.cpp
 
-	: be network bnetapi libshared.a [ TargetLibstdc++ ] [ TargetLibsupc++ ]
+	: be network bnetapi shared [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 ;