diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index a93503c2c0..76f131fe00 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -2,6 +2,7 @@
 # subdirectory.
 local packages = [ FFilterByBuildFeatures
 	HaikuDevel
+	HaikuExtras
 	HaikuLoader
 	HaikuSource
 	HaikuUserguide
diff --git a/build/jam/packages/HaikuExtras b/build/jam/packages/HaikuExtras
new file mode 100644
index 0000000000..8002f725bc
--- /dev/null
+++ b/build/jam/packages/HaikuExtras
@@ -0,0 +1,11 @@
+local architecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
+
+local extrasPackage = haiku_extras.hpkg ;
+HaikuPackage $(extrasPackage) ;
+
+# kernel modules
+AddFilesToPackage add-ons kernel partitioning_systems
+	: amiga_rdb@!m68k apple@!ppc ;
+
+BuildHaikuPackage $(extrasPackage) : haiku_extras ;
+
diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku
index e547584898..6cd12a8e94 100644
--- a/build/jam/repositories/Haiku
+++ b/build/jam/repositories/Haiku
@@ -19,6 +19,7 @@ local packages = [ FFilterByBuildFeatures
 
 if $(HAIKU_IS_BOOTSTRAP) != 1 {
 	packages += [ FFilterByBuildFeatures
+		haiku_extras
 		haiku_source
 		haiku_userguide_ca
 		haiku_userguide_de
diff --git a/src/data/package_infos/generic/haiku_extras b/src/data/package_infos/generic/haiku_extras
new file mode 100644
index 0000000000..5cb60e201d
--- /dev/null
+++ b/src/data/package_infos/generic/haiku_extras
@@ -0,0 +1,20 @@
+name			haiku_extras
+version			%HAIKU_VERSION%
+architecture	%HAIKU_PACKAGING_ARCH%
+summary			"Haiku extra files"
+description 	"Miscellaneous files and applications for Haiku, usually not
+needed on standard installations."
+
+packager		"The Haiku build system"
+vendor			"Haiku Project"
+
+copyrights		"2007-2018 Haiku, Inc."
+licenses		MIT
+
+provides {
+	haiku_extras=%HAIKU_VERSION%
+}
+
+requires {
+	haiku
+}