diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile
index 459d7450fa..b8944a5776 100644
--- a/src/add-ons/input_server/devices/keyboard/Jamfile
+++ b/src/add-ons/input_server/devices/keyboard/Jamfile
@@ -13,3 +13,6 @@ if $(COMPILE_FOR_R5) {
         LinkSharedOSLibs <input>keyboard : <boot!home!config!lib>libopenbeos.so ;
 }
 
+Package haiku-inputkit-cvs :
+	<input>keyboard : 
+	boot home config add-ons input_server devices ;
diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile
index 20c7ca40fb..52c50caf4a 100644
--- a/src/add-ons/input_server/devices/mouse/Jamfile
+++ b/src/add-ons/input_server/devices/mouse/Jamfile
@@ -12,3 +12,6 @@ if $(COMPILE_FOR_R5) {
         LinkSharedOSLibs <input>mouse : <boot!home!config!lib>libopenbeos.so ;
 }
 
+Package haiku-inputkit-cvs :
+        <input>mouse :
+        boot home config add-ons input_server devices ;
diff --git a/src/add-ons/kernel/drivers/input/hid/Jamfile b/src/add-ons/kernel/drivers/input/hid/Jamfile
index ac53b97d0f..1447b5ab26 100644
--- a/src/add-ons/kernel/drivers/input/hid/Jamfile
+++ b/src/add-ons/kernel/drivers/input/hid/Jamfile
@@ -15,3 +15,12 @@ R5KernelAddon hid : kernel drivers bin :
 	MakeLocate $(instDriver) : $(dir) ;
 	RelSymLink $(instDriver) : hid ;
 }
+
+Package haiku-inputkit-cvs :
+        hid :
+        boot home config add-ons kernel drivers bin ;
+
+Package haiku-inputkit-cvs :
+        <kernel!drivers!dev!input>hid :
+        boot home config add-ons kernel drivers dev input ;
+
diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile
index 8f9bb81b04..20a476f4d1 100644
--- a/src/servers/input/Jamfile
+++ b/src/servers/input/Jamfile
@@ -68,3 +68,7 @@ if $(COMPILE_FOR_R5) {
 SEARCH on [ FGristFiles AddOnMonitor.cpp
 	AddOnMonitorHandler.cpp
 	NodeMonitorHandler.cpp ] += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
+
+Package haiku-inputkit-cvs :
+        input_server :
+        boot beos system servers ;