diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 7ea563178c..dd58e5ecde 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -1144,7 +1144,11 @@ int InputServer::DispatchEvent(BMessage *message)
     PRINT(("[DispatchEvent] x = %lu:\n", xValue));
 	
 	port_id pid = find_port(SERVER_INPUT_PORT);
-   	BPortLink *appsvrlink = new BPortLink(pid);
+
+	// BPortLink is incompatible with R5 one
+#ifndef COMPILE_FOR_R5
+
+	BPortLink *appsvrlink = new BPortLink(pid);
    	switch(message->what){
    		case B_MOUSE_MOVED:{
     		// get point and button from msg
@@ -1334,6 +1338,9 @@ int InputServer::DispatchEvent(BMessage *message)
    			
 		}
 	delete appsvrlink;
+	
+#endif	// COMPILE_FOR_R5
+
     return true;
 }
 
diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile
index 8189a1b8f9..8c672c6252 100644
--- a/src/servers/input/Jamfile
+++ b/src/servers/input/Jamfile
@@ -1,5 +1,9 @@
 SubDir OBOS_TOP src servers input ;
 
+if $(COMPILE_FOR_R5) {
+	SubDirC++Flags -DCOMPILE_FOR_R5 ;
+}
+
 AddResources input_server : input_server.rdef ;
 
 UsePrivateHeaders app ;
@@ -19,9 +23,14 @@ Server input_server :
 	AddOnMonitorHandler.cpp
 	NodeMonitorHandler.cpp
 
-	: be <boot!home!config!lib>libopenbeos.so
+	: be
 ;
 
+if $(COMPILE_FOR_R5) {
+} else {
+	LinkSharedOSLibs input_server : <boot!home!config!lib>libopenbeos.so ;
+}
+
 SEARCH on [ FGristFiles AddOnMonitor.cpp
 	AddOnMonitorHandler.cpp
 	NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;