diff --git a/src/add-ons/disk_scanner/Jamfile b/src/add-ons/disk_scanner/Jamfile
index ad3eb23fe3..16cd846ec3 100644
--- a/src/add-ons/disk_scanner/Jamfile
+++ b/src/add-ons/disk_scanner/Jamfile
@@ -1,4 +1,11 @@
 SubDir OBOS_TOP src add-ons disk_scanner ;
 
+# For convenience: Pseudo target that builds all GUI add-ons.
+#
+NotFile gui_disk_scanner_add_ons ;
+Depends gui_disk_scanner_add_ons
+	: <boot!home!config!add-ons!disk_scanner!partition>intel
+;
+
 SubInclude OBOS_TOP src add-ons disk_scanner fs ;
 SubInclude OBOS_TOP src add-ons disk_scanner partition ;
diff --git a/src/add-ons/disk_scanner/partition/Jamfile b/src/add-ons/disk_scanner/partition/Jamfile
index 2cbb621071..200bfbe926 100644
--- a/src/add-ons/disk_scanner/partition/Jamfile
+++ b/src/add-ons/disk_scanner/partition/Jamfile
@@ -1 +1,9 @@
 SubDir OBOS_TOP src add-ons disk_scanner partition ;
+
+UsePrivateHeaders shared ;
+UsePrivateHeaders storage ;
+
+Addon <gui>intel : disk_scanner : intel.cpp : false
+	: <boot!home!config!lib>libdiskdevice.so be ;
+AbsSymLink <boot!home!config!add-ons!disk_scanner!partition>intel : <gui>intel
+	: /boot/home/config/add-ons/disk_scanner/partition ;