diff --git a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile
index 669149664e..5ceccc9bd7 100644
--- a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile
+++ b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile
@@ -8,12 +8,11 @@ KernelAddon amiga_rdb : kernel partitioning_systems :
 	amiga_rdb.cpp
 	;
 
-# For now build a userland version only.
-Addon <partitioning_system>amiga_rdb : userland partitioning_systems :
-	amiga_rdb.cpp
-	;
-
-LinkSharedOSLibs <partitioning_system>amiga_rdb :
-	libkernelland_emu.so
-	libdisk_device_manager.so
-	;
+#Addon <partitioning_system>amiga_rdb : userland partitioning_systems :
+#	amiga_rdb.cpp
+#	;
+#
+#LinkSharedOSLibs <partitioning_system>amiga_rdb :
+#	libkernelland_emu.so
+#	libdisk_device_manager.so
+#	;
diff --git a/src/add-ons/kernel/partitioning_systems/apple/Jamfile b/src/add-ons/kernel/partitioning_systems/apple/Jamfile
index d96c225d65..a23a1f8f52 100644
--- a/src/add-ons/kernel/partitioning_systems/apple/Jamfile
+++ b/src/add-ons/kernel/partitioning_systems/apple/Jamfile
@@ -8,12 +8,11 @@ KernelAddon apple : kernel partitioning_systems :
 	apple.cpp
 	;
 
-# For now build a userland version only.
-Addon <partitioning_system>apple : userland partitioning_systems :
-	apple.cpp
-	;
-
-LinkSharedOSLibs <partitioning_system>apple :
-	libkernelland_emu.so
-	libdisk_device_manager.so
-	;
+#Addon <partitioning_system>apple : userland partitioning_systems :
+#	apple.cpp
+#	;
+#
+#LinkSharedOSLibs <partitioning_system>apple :
+#	libkernelland_emu.so
+#	libdisk_device_manager.so
+#	;
diff --git a/src/add-ons/kernel/partitioning_systems/session/Jamfile b/src/add-ons/kernel/partitioning_systems/session/Jamfile
index b883f5646c..f61b607e89 100644
--- a/src/add-ons/kernel/partitioning_systems/session/Jamfile
+++ b/src/add-ons/kernel/partitioning_systems/session/Jamfile
@@ -17,18 +17,16 @@ local session_files =
 	session.cpp
 	;
 
-Objects $(session_files) ;
-
 KernelAddon session : kernel partitioning_systems :
-	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
-	;
+	$(session_files)
+;
 
 # also build a userland version
-Addon <partitioning_system>session : userland partitioning_systems :
-	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
-;
-
-LinkSharedOSLibs <partitioning_system>session :
-	libkernelland_emu.so
-	libdisk_device_manager.so
-;
+#Addon <partitioning_system>session : userland partitioning_systems :
+#	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
+#;
+#
+#LinkSharedOSLibs <partitioning_system>session :
+#	libkernelland_emu.so
+#	libdisk_device_manager.so
+#;