diff --git a/src/add-ons/kernel/partitioning_systems/session/Jamfile b/src/add-ons/kernel/partitioning_systems/session/Jamfile
index a99ff42876..b883f5646c 100644
--- a/src/add-ons/kernel/partitioning_systems/session/Jamfile
+++ b/src/add-ons/kernel/partitioning_systems/session/Jamfile
@@ -11,17 +11,21 @@ UsePrivateHeaders [ FDirName storage ] ;
 #	SubDirC++Flags $(defines) ;
 }
 
-KernelAddon session : kernel partitioning_systems :
+local session_files = 
 	Debug.cpp
 	Disc.cpp
 	session.cpp
 	;
 
+Objects $(session_files) ;
+
+KernelAddon session : kernel partitioning_systems :
+	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
+	;
+
 # also build a userland version
 Addon <partitioning_system>session : userland partitioning_systems :
-	Debug.cpp
-	Disc.cpp
-	session.cpp
+	[ FGristFiles $(session_files:S=$(SUFOBJ)) ]
 ;
 
 LinkSharedOSLibs <partitioning_system>session :