diff --git a/src/add-ons/kernel/bus_managers/Jamfile b/src/add-ons/kernel/bus_managers/Jamfile
index f1de07bb5b..777b8801dd 100644
--- a/src/add-ons/kernel/bus_managers/Jamfile
+++ b/src/add-ons/kernel/bus_managers/Jamfile
@@ -9,6 +9,7 @@ SubInclude HAIKU_TOP src add-ons kernel bus_managers ide ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers isa ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers pci ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers ps2 ;
+SubInclude HAIKU_TOP src add-ons kernel bus_managers random ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers scsi ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers tty ;
 SubInclude HAIKU_TOP src add-ons kernel bus_managers usb ;
diff --git a/src/add-ons/kernel/bus_managers/random/Jamfile b/src/add-ons/kernel/bus_managers/random/Jamfile
new file mode 100644
index 0000000000..f5a33f928e
--- /dev/null
+++ b/src/add-ons/kernel/bus_managers/random/Jamfile
@@ -0,0 +1,8 @@
+SubDir HAIKU_TOP src add-ons kernel bus_managers random ;
+
+UsePrivateKernelHeaders ;
+
+KernelAddon random :
+	driver.cpp
+	yarrow_rng.cpp
+;
diff --git a/src/add-ons/kernel/drivers/random/driver.cpp b/src/add-ons/kernel/bus_managers/random/driver.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/random/driver.cpp
rename to src/add-ons/kernel/bus_managers/random/driver.cpp
diff --git a/src/add-ons/kernel/drivers/random/random.h b/src/add-ons/kernel/bus_managers/random/random.h
similarity index 100%
rename from src/add-ons/kernel/drivers/random/random.h
rename to src/add-ons/kernel/bus_managers/random/random.h
diff --git a/src/add-ons/kernel/drivers/random/yarrow_rng.cpp b/src/add-ons/kernel/bus_managers/random/yarrow_rng.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/random/yarrow_rng.cpp
rename to src/add-ons/kernel/bus_managers/random/yarrow_rng.cpp
diff --git a/src/add-ons/kernel/drivers/random/yarrow_rng.h b/src/add-ons/kernel/bus_managers/random/yarrow_rng.h
similarity index 100%
rename from src/add-ons/kernel/drivers/random/yarrow_rng.h
rename to src/add-ons/kernel/bus_managers/random/yarrow_rng.h
diff --git a/src/add-ons/kernel/drivers/Jamfile b/src/add-ons/kernel/drivers/Jamfile
index 8a93b6de29..1007276702 100644
--- a/src/add-ons/kernel/drivers/Jamfile
+++ b/src/add-ons/kernel/drivers/Jamfile
@@ -16,7 +16,6 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network ;
 SubInclude HAIKU_TOP src add-ons kernel drivers ports ;
 SubInclude HAIKU_TOP src add-ons kernel drivers power ;
 SubInclude HAIKU_TOP src add-ons kernel drivers printer ;
-SubInclude HAIKU_TOP src add-ons kernel drivers random ;
 SubInclude HAIKU_TOP src add-ons kernel drivers timer ;
 SubInclude HAIKU_TOP src add-ons kernel drivers tty ;
 SubInclude HAIKU_TOP src add-ons kernel drivers video ;
diff --git a/src/add-ons/kernel/drivers/random/Jamfile b/src/add-ons/kernel/drivers/random/Jamfile
deleted file mode 100644
index 7e0cc0f002..0000000000
--- a/src/add-ons/kernel/drivers/random/Jamfile
+++ /dev/null
@@ -1,11 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers random ;
-
-UsePrivateKernelHeaders ;
-
-KernelAddon random :
-	driver.cpp
-	yarrow_rng.cpp
-;
-
-# CFLAGS was arch dependent:
-#	-fno-pic -D_KERNEL_MODE -O99 -mpentiumpro -march=pentiumpro -Wno-missing-prototypes