diff --git a/src/kits/storage/Jamfile b/src/kits/storage/Jamfile
index 730a74bbe5..861e6c5565 100644
--- a/src/kits/storage/Jamfile
+++ b/src/kits/storage/Jamfile
@@ -1 +1,39 @@
 SubDir OBOS_TOP src kits storage ;
+
+UsePrivateHeaders $(DOT) ;
+UsePrivateHeaders app ;
+UsePrivateHeaders shared ;
+UsePrivateHeaders storage ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ]
+				 [ FDirName $(OBOS_TOP) src kits app ]
+				 [ FDirName $(OBOS_TOP) src kits storage ] ;
+
+# We need to keep the DiskDevice API out of libopenbeos as long as the
+# Interface Kit is not fully functional (at least the part we are using).
+# So, we build a separate library.
+#
+SharedLibrary diskdevice
+	: AddOnImage.cpp
+	  DiskDevice.cpp
+	  DiskDeviceList.cpp
+	  DiskDevicePrivate.cpp
+	  DiskDeviceRoster.cpp
+	  DiskDeviceVisitor.cpp
+	  DiskScannerAddOn.cpp
+	  Mime.cpp
+	  Partition.cpp
+	  PartitioningDialog.cpp
+	  RegistrarDefs.cpp
+#	  Roster.cpp
+	  RosterPrivate.cpp
+	  Session.cpp
+
+	  # from libroot
+	  #
+	  disk_scanner.cpp
+
+	: <boot!home!config!lib>libkernelland_emu.so be
+;
+AbsSymLink <boot!home!config!lib>libdiskdevice.so : libdiskdevice.so
+	: /boot/home/config/lib ;