diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index d447c4fa44..2d2d4f2989 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -256,7 +256,7 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ;
 		HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ;
 	}
 	HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ;
-	HAIKU_LIBRARY_NAME_MAP_/system/servers/input_server = <nogrist>input_server ;
+	HAIKU_LIBRARY_NAME_MAP_input_server = <nogrist>input_server ;
 }
 
 
@@ -403,6 +403,7 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 	HOST_LIBROOT = root ;
 	HOST_LIBBE = be ;
 	HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR = ;
+	HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
 } else {
 	HOST_LIBSTDC++ = stdc++ ;
 	HOST_LIBROOT = libroot_build.so ;
@@ -561,7 +562,7 @@ if $(TARGET_PLATFORM) = haiku {
 
 	TARGET_BOOT_PLATFORM		= ;
 
-	TARGET_LIBRARY_NAME_MAP		= ;
+	TARGET_LIBRARY_NAME_MAP		= HOST_LIBRARY_NAME_MAP ;
 }
 
 # define macro, for identifying the platform
diff --git a/src/add-ons/input_server/devices/easypen/Jamfile b/src/add-ons/input_server/devices/easypen/Jamfile
index 87bd29b45d..1c26c4e585 100644
--- a/src/add-ons/input_server/devices/easypen/Jamfile
+++ b/src/add-ons/input_server/devices/easypen/Jamfile
@@ -7,5 +7,5 @@ UsePrivateHeaders input ;
 Addon <input>easypen : input_server/devices : 
 	EasyPenInputDevice.cpp 
 	: false 
-	: be device <nogrist>input_server ;
+	: be device input_server ;
 
diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile
index 3852f14b77..52bb04a88e 100644
--- a/src/add-ons/input_server/devices/keyboard/Jamfile
+++ b/src/add-ons/input_server/devices/keyboard/Jamfile
@@ -13,7 +13,7 @@ Addon <input>keyboard : input_server/devices :
 	TMListItem.cpp
 
 	: false 
-	: /system/servers/input_server be ;
+	: input_server be ;
 
 Package haiku-inputkit-cvs :
 	<input>keyboard : 
diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile
index aa1848813c..0394df9dcc 100644
--- a/src/add-ons/input_server/devices/mouse/Jamfile
+++ b/src/add-ons/input_server/devices/mouse/Jamfile
@@ -7,7 +7,7 @@ UsePrivateHeaders input ;
 Addon <input>mouse : input_server/devices : 
 	MouseInputDevice.cpp 
 	: false 
-	: be /system/servers/input_server ;
+	: be input_server ;
 
 Package haiku-inputkit-cvs :
         <input>mouse :
diff --git a/src/add-ons/input_server/devices/serial_mouse/Jamfile b/src/add-ons/input_server/devices/serial_mouse/Jamfile
index 8abdff4d81..7ac0914a58 100644
--- a/src/add-ons/input_server/devices/serial_mouse/Jamfile
+++ b/src/add-ons/input_server/devices/serial_mouse/Jamfile
@@ -8,7 +8,7 @@ Addon <input>serial_mouse : input_server/devices :
 	MouseInputDevice.cpp 
 	SerialMouse.cpp
 	: false 
-	: be device <nogrist>input_server ;
+	: be device input_server ;
 
 Package haiku-inputkit-cvs :
         <input>serial_mouse :
diff --git a/src/add-ons/input_server/devices/tablet/Jamfile b/src/add-ons/input_server/devices/tablet/Jamfile
index 86ee29c7b4..15ed842585 100644
--- a/src/add-ons/input_server/devices/tablet/Jamfile
+++ b/src/add-ons/input_server/devices/tablet/Jamfile
@@ -7,7 +7,7 @@ UsePrivateHeaders input ;
 Addon <input>tablet : input_server/devices : 
 	TabletInputDevice.cpp 
 	: false 
-	: be <nogrist>input_server ;
+	: be input_server ;
 
 Package haiku-inputkit-cvs :
         <input>tablet :
diff --git a/src/add-ons/input_server/filters/screensaver/Jamfile b/src/add-ons/input_server/filters/screensaver/Jamfile
index cdbc3bc470..bce87dc50d 100644
--- a/src/add-ons/input_server/filters/screensaver/Jamfile
+++ b/src/add-ons/input_server/filters/screensaver/Jamfile
@@ -7,7 +7,7 @@ UsePrivateHeaders screen_saver ;
 Addon screen_saver : input_server/filters : 
 	ScreenSaverFilter.cpp 
 	: false 
-	: be libscreensaver.so <nogrist>input_server ;
+	: be libscreensaver.so input_server ;
 
 Package haiku-screensaverkit-cvs :
 	screen_saver :
diff --git a/src/add-ons/input_server/methods/canna/Jamfile b/src/add-ons/input_server/methods/canna/Jamfile
index 257e25b4c3..aee25fe4be 100644
--- a/src/add-ons/input_server/methods/canna/Jamfile
+++ b/src/add-ons/input_server/methods/canna/Jamfile
@@ -18,7 +18,7 @@ Addon canna : input_server/methods :
 	KouhoWindow.cpp
 	PaletteWindow.cpp
 	: false
-	: be textencoding <nogrist>input_server libcanna.a librk.a ;
+	: be textencoding input_server libcanna.a librk.a ;
 
 Package haiku-cannaIM-cvs :
 	canna :