diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
index 811c8e5938..6e4e22339e 100644
--- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
+++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/Jamfile
@@ -1,5 +1,9 @@
 SubDir OBOS_TOP src add-ons kernel drivers arch x86 ps2mouse ;
 
+if $(COMPILE_FOR_R5) {
+	SubDirCcFlags -DCOMPILE_FOR_R5 ;
+}
+
 UsePrivateHeaders input ;
 
 KernelObjects
@@ -19,3 +23,28 @@ KernelLd ps2mouse :
 	:
 	drivers/dev/ps2mouse
 	; 
+
+R5KernelAddon <driver>ps2mouse : kernel drivers bin :
+	ps2mouse.c
+;
+
+# Link to kernel/drivers/dev/input
+{
+	local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev input ] ;
+	local instDriver = <kernel!drivers!dev!input>ps2mouse ;
+	MakeLocate $(instDriver) : $(dir) ;
+	RelSymLink $(instDriver) : <driver>ps2mouse ;
+}
+
+#Package haiku-inputkit-cvs
+#	:
+#	<driver>ps2mouse
+#	:
+#	boot home config add-ons kernel drivers bin ;
+
+#Package haiku-inputkit-cvs
+#	:
+#	<kernel!drivers!dev!input>ps2mouse
+#	:
+#	boot home config add-ons kernel drivers dev input ;
+
diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/cbuf_adapter.h b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/cbuf_adapter.h
deleted file mode 100644
index d3f322d774..0000000000
--- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/cbuf_adapter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __CBUF_ADAPTER_H
-#define __CBUF_ADAPTER_H
-
-#include <SupportDefs.h>
-
-struct cbuffer_t;
-typedef struct cbuffer_t cbuffer;
-
-size_t cbuf_getn_no_lock(cbuffer *, char *, size_t);
-size_t cbuf_putn_no_lock(cbuffer *, char *, size_t);
-cbuffer *cbuf_init(size_t size);
-void cbuf_delete(cbuffer *buffer);
-char cbuf_get(cbuffer *);
-bool cbuf_mt(cbuffer *);
-bool cbuf_full(cbuffer *);
-status_t cbuf_put(cbuffer *, char);
-status_t cbuf_unput(cbuffer *);
-void cbuf_flush(cbuffer *);
-size_t cbuf_size(cbuffer *);
-size_t cbuf_avail(cbuffer *);
-size_t cbuf_free(cbuffer *);
-size_t cbuf_putn(cbuffer *, char *, size_t num_bytes);
-size_t cbuf_getn(cbuffer *, char *, size_t num_bytes);
-cpu_status cbuf_lock(cbuffer *);
-void cbuf_unlock(cbuffer *, cpu_status);
-
-#define cbuf cbuffer
-#define cbuf_get_chain(size) cbuf_init(size)
-#define cbuf_free_chain(chain) cbuf_delete(chain)
-#define cbuf_memcpy_from_chain(dest, chain, offset, size) \
-	(cbuf_getn(chain, dest, size) - size)
-#define cbuf_memcpy_to_chain(chain, offset, source, size) \
-	(cbuf_putn(chain, source, size) - size)
-
-
-#endif