diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 92d9538f8a..d447c4fa44 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -256,6 +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 ;
 }
 
 
diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile
index d6084abd45..3852f14b77 100644
--- a/src/add-ons/input_server/devices/keyboard/Jamfile
+++ b/src/add-ons/input_server/devices/keyboard/Jamfile
@@ -13,13 +13,7 @@ Addon <input>keyboard : input_server/devices :
 	TMListItem.cpp
 
 	: false 
-	: <nogrist>input_server ;
-
-if $(COMPILE_FOR_R5) {
-	LinkAgainst <input>keyboard : be ;
-} else {
-        LinkAgainst <input>keyboard : libroot.so libbe.so ;
-}
+	: /system/servers/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 92baa766f0..aa1848813c 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 <nogrist>input_server ;
+	: be /system/servers/input_server ;
 
 Package haiku-inputkit-cvs :
         <input>mouse :