diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index 8bb519a3f6..f96e77c539 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -22,45 +22,42 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 
 
 # modules
-AddFilesToPackage $(haikuPackage) : system add-ons kernel bus_managers
+AddFilesToPackage $(haikuPackage) : add-ons kernel bus_managers
 	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel busses agp_gart
+AddFilesToPackage $(haikuPackage) : add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
 
 if $(HAIKU_ATA_STACK) = 1 {
-	AddFilesToPackage $(haikuPackage) : system add-ons kernel busses ata
+	AddFilesToPackage $(haikuPackage) : add-ons kernel busses ata
 		: generic_ide_pci it8211 legacy_sata silicon_image_3112
 			$(X86_ONLY)ide_isa ;
 } else {
-	AddFilesToPackage $(haikuPackage) : system add-ons kernel busses ide
+	AddFilesToPackage $(haikuPackage) : add-ons kernel busses ide
 		: generic_ide_pci it8211 legacy_sata silicon_image_3112
 			$(X86_ONLY)ide_isa ;
 }
 
-AddFilesToPackage $(haikuPackage) : system add-ons kernel busses scsi
+AddFilesToPackage $(haikuPackage) : add-ons kernel busses scsi
 	: ahci ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel busses usb
+AddFilesToPackage $(haikuPackage) : add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel console
+AddFilesToPackage $(haikuPackage) : add-ons kernel console
 	: vga_text ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel debugger
+AddFilesToPackage $(haikuPackage) : add-ons kernel debugger
 	: <kdebug>demangle $(X86_ONLY)<kdebug>disasm
 	  <kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel file_systems
+AddFilesToPackage $(haikuPackage) : add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel generic
+AddFilesToPackage $(haikuPackage) : add-ons kernel generic
 	: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
 		scsi_periph <module>tty ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons kernel partitioning_systems
+AddFilesToPackage $(haikuPackage) : add-ons kernel partitioning_systems
 	: amiga_rdb apple efi_gpt intel session ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons kernel interrupt_controllers
+AddFilesToPackage $(haikuPackage) : add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-	AddFilesToPackage $(haikuPackage) : system add-ons kernel cpu
-		: generic_x86 ;
+	AddFilesToPackage $(haikuPackage) : add-ons kernel cpu : generic_x86 ;
 }
 
 # drivers
@@ -95,11 +92,10 @@ AddDriversToPackage $(haikuPackage) : ports		: usb_serial ;
 #	: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 
 # kernel
-AddFilesToPackage $(haikuPackage) : system
-	: <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToPackage $(haikuPackage) : : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddLibrariesToPackage $(haikuPackage) : system lib
+AddLibrariesToPackage $(haikuPackage) : lib
 	: $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
 
 # libnetwork.so replaces quite a few libraries
@@ -109,12 +105,10 @@ SYSTEM_LIBS_LIBNETWORK_ALIASES
 if $(HAIKU_GCC_VERSION[1]) = 2 {
 	local lib ;
 	for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
-		AddSymlinkToPackage $(haikuPackage) : system lib
-			: libnetwork.so : $(lib) ;
+		AddSymlinkToPackage $(haikuPackage) : lib : libnetwork.so : $(lib) ;
 	}
 
-	AddSymlinkToPackage $(haikuPackage) : system lib : libbnetapi.so
-		: libnetapi.so ;
+	AddSymlinkToPackage $(haikuPackage) : lib : libbnetapi.so : libnetapi.so ;
 }
 
 
@@ -125,7 +119,7 @@ SYSTEM_LIBS_LIBGL_ALIASES
 if $(TARGET_ARCH) = x86 {
 	local lib ;
 	for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
-		AddSymlinkToPackage $(haikuPackage) : system lib : libGL.so : $(lib) ;
+		AddSymlinkToPackage $(haikuPackage) : lib : libGL.so : $(lib) ;
 	}
 }
 
@@ -136,107 +130,105 @@ SYSTEM_LIBS_ALIASES =
 ;
 
 # servers
-AddFilesToPackage $(haikuPackage) : system servers : $(SYSTEM_SERVERS) ;
+AddFilesToPackage $(haikuPackage) : servers : $(SYSTEM_SERVERS) ;
 
 # apps
-AddFilesToPackage $(haikuPackage) : system			: runtime_loader ;
-AddFilesToPackage $(haikuPackage) : system			: Deskbar Tracker ;
-AddFilesToPackage $(haikuPackage) : system bin		: $(SYSTEM_BIN) consoled ;
-AddFilesToPackage $(haikuPackage) : system apps		: $(SYSTEM_APPS) ;
-AddFilesToPackage $(haikuPackage) : system preferences
-	: $(SYSTEM_PREFERENCES) ;
-AddFilesToPackage $(haikuPackage) : system demos	: $(SYSTEM_DEMOS) ;
+AddFilesToPackage $(haikuPackage) : 			: runtime_loader ;
+AddFilesToPackage $(haikuPackage) : 			: Deskbar Tracker ;
+AddFilesToPackage $(haikuPackage) : bin			: $(SYSTEM_BIN) consoled ;
+AddFilesToPackage $(haikuPackage) : apps		: $(SYSTEM_APPS) ;
+AddFilesToPackage $(haikuPackage) : preferences	: $(SYSTEM_PREFERENCES) ;
+AddFilesToPackage $(haikuPackage) : demos		: $(SYSTEM_DEMOS) ;
 
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage $(haikuPackage) : system bin : which ;
+AddFilesToPackage $(haikuPackage) : bin : which ;
 SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage $(haikuPackage) : system bin : installoptionalpackage ;
+AddFilesToPackage $(haikuPackage) : bin : installoptionalpackage ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage $(haikuPackage) : system bin : install-wifi-firmwares.sh ;
+AddFilesToPackage $(haikuPackage) : bin : install-wifi-firmwares.sh ;
 
-AddSymlinkToPackage $(haikuPackage) : system bin : bash : sh ;
-AddSymlinkToPackage $(haikuPackage) : system bin : trash : untrash ;
+AddSymlinkToPackage $(haikuPackage) : bin : bash : sh ;
+AddSymlinkToPackage $(haikuPackage) : bin : trash : untrash ;
 
-AddSymlinkToPackage $(haikuPackage) : system bin : bzip2 : bunzip2 ;
-AddSymlinkToPackage $(haikuPackage) : system bin : less : more ;
-AddSymlinkToPackage $(haikuPackage) : system bin : gzip : gunzip ;
-AddSymlinkToPackage $(haikuPackage) : system bin : gzip : zcat ;
-AddSymlinkToPackage $(haikuPackage) : system bin : zdiff : zcmp ;
-AddSymlinkToPackage $(haikuPackage) : system bin : unzip : zipinfo ;
-AddSymlinkToPackage $(haikuPackage) : system bin : gawk : awk ;
-AddSymlinkToPackage $(haikuPackage) : system bin : grep : egrep ;
-AddSymlinkToPackage $(haikuPackage) : system bin : grep : fgrep ;
+AddSymlinkToPackage $(haikuPackage) : bin : bzip2 : bunzip2 ;
+AddSymlinkToPackage $(haikuPackage) : bin : less : more ;
+AddSymlinkToPackage $(haikuPackage) : bin : gzip : gunzip ;
+AddSymlinkToPackage $(haikuPackage) : bin : gzip : zcat ;
+AddSymlinkToPackage $(haikuPackage) : bin : zdiff : zcmp ;
+AddSymlinkToPackage $(haikuPackage) : bin : unzip : zipinfo ;
+AddSymlinkToPackage $(haikuPackage) : bin : gawk : awk ;
+AddSymlinkToPackage $(haikuPackage) : bin : grep : egrep ;
+AddSymlinkToPackage $(haikuPackage) : bin : grep : fgrep ;
 
 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
 	InstallerInitScript InstallerFinishScript ;
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToPackage $(haikuPackage) : system boot : $(bootScripts) ;
+AddFilesToPackage $(haikuPackage) : boot : $(bootScripts) ;
 
 # artwork and sounds
 local logoArtwork =
 	$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
 	$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
 SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
-AddFilesToPackage $(haikuPackage) : system data artwork : $(logoArtwork) ;
+AddFilesToPackage $(haikuPackage) : data artwork : $(logoArtwork) ;
 
-AddDirectoryToPackage $(haikuPackage) : system data sounds ;
+AddDirectoryToPackage $(haikuPackage) : data sounds ;
 
 # Mail spell check dictionaries
 local spellFiles = words geekspeak ;
 spellFiles = $(spellFiles:G=spell) ;
 SEARCH on $(spellFiles) = [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToPackage $(haikuPackage) : system data spell_check word_dictionary
+AddFilesToPackage $(haikuPackage) : data spell_check word_dictionary
 	: $(spellFiles) ;
 
 local dataFiles = teapot.data ;
 dataFiles = $(dataFiles:G=data) ;
 SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
-AddFilesToPackage $(haikuPackage) : system data : $(dataFiles) ;
+AddFilesToPackage $(haikuPackage) : data : $(dataFiles) ;
 
 local fortuneFiles = [ Glob $(HAIKU_TOP)/data/system/data/fortunes
 	: [a-zA-Z0-9]* ] ;
 fortuneFiles = $(fortuneFiles:G=data!fortunes) ;
-AddFilesToPackage $(haikuPackage) : system data fortunes : $(fortuneFiles) ;
+AddFilesToPackage $(haikuPackage) : data fortunes : $(fortuneFiles) ;
 
 local fontDir = [ FDirName $(HAIKU_TOP) data system data fonts ] ;
 local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
 local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
-AddFilesToPackage $(haikuPackage) : system data fonts psfonts : $(psFonts) ;
-AddFilesToPackage $(haikuPackage) : system data fonts ttfonts : $(ttFonts) ;
+AddFilesToPackage $(haikuPackage) : data fonts psfonts : $(psFonts) ;
+AddFilesToPackage $(haikuPackage) : data fonts ttfonts : $(ttFonts) ;
 
 local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
 local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
 local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
 local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
 	: *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToPackage $(haikuPackage) : system data Canna default
+AddFilesToPackage $(haikuPackage) : data Canna default
 	: $(cannaDefault) ;
-AddFilesToPackage $(haikuPackage) : system data Canna dic : $(cannaDic) ;
-AddFilesToPackage $(haikuPackage) : system data Canna dic canna
+AddFilesToPackage $(haikuPackage) : data Canna dic : $(cannaDic) ;
+AddFilesToPackage $(haikuPackage) : data Canna dic canna
 	: $(cannaDicCanna) ;
-AddDirectoryToPackage $(haikuPackage) : system data Canna dic group ;
-AddDirectoryToPackage $(haikuPackage) : system data Canna dic user ;
+AddDirectoryToPackage $(haikuPackage) : data Canna dic group ;
+AddDirectoryToPackage $(haikuPackage) : data Canna dic user ;
 
 local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToPackage $(haikuPackage) : system data Keymaps : $(keymapFiles) ;
-AddSymlinkToPackage $(haikuPackage) : system data Keymaps : Swedish
+AddFilesToPackage $(haikuPackage) : data Keymaps : $(keymapFiles) ;
+AddSymlinkToPackage $(haikuPackage) : data Keymaps : Swedish
 	: Finnish ;
-AddSymlinkToPackage $(haikuPackage) : system data Keymaps : Slovene
+AddSymlinkToPackage $(haikuPackage) : data Keymaps : Slovene
 	: Croatian ;
-AddSymlinkToPackage $(haikuPackage) : system data Keymaps : US-International
+AddSymlinkToPackage $(haikuPackage) : data Keymaps : US-International
 	: Brazilian ;
 
 local keyboardLayoutsDir
 	= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
 local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
-AddFilesToPackage $(haikuPackage) : system data KeyboardLayouts
-	: $(keyboardLayouts) ;
+AddFilesToPackage $(haikuPackage) : data KeyboardLayouts : $(keyboardLayouts) ;
 
 # boot loader
-AddFilesToPackage $(haikuPackage) : system : haiku_loader ;
+AddFilesToPackage $(haikuPackage) : : haiku_loader ;
 
 # boot module links
 AddBootModuleSymlinksToPackage $(haikuPackage) :
@@ -253,91 +245,88 @@ AddBootModuleSymlinksToPackage $(haikuPackage) :
 ;
 
 # add-ons
-AddFilesToPackage $(haikuPackage) : system add-ons accelerants
+AddFilesToPackage $(haikuPackage) : add-ons accelerants
 	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons opengl
+AddFilesToPackage $(haikuPackage) : add-ons opengl
 	: Mesa\ Software\ Renderer ;
-AddFilesToPackage $(haikuPackage) : system add-ons Translators
+AddFilesToPackage $(haikuPackage) : add-ons Translators
 	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons locale catalogs
+AddFilesToPackage $(haikuPackage) : add-ons locale catalogs
 	: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons locale catalogs
+AddFilesToPackage $(haikuPackage) : add-ons locale catalogs
 	: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons mail_daemon inbound_protocols
+AddFilesToPackage $(haikuPackage) : add-ons mail_daemon inbound_protocols
 	: POP3 IMAP ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons mail_daemon outbound_protocols : SMTP ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons mail_daemon inbound_filters
+AddFilesToPackage $(haikuPackage) : add-ons mail_daemon outbound_protocols
+	: SMTP ;
+AddFilesToPackage $(haikuPackage) : add-ons mail_daemon inbound_filters
 	: MatchHeader SpamFilter NewMailNotification ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons mail_daemon outbound_filters
+AddFilesToPackage $(haikuPackage) : add-ons mail_daemon outbound_filters
 	: Fortune ;
-AddFilesToPackage $(haikuPackage) : system add-ons media
-	: $(SYSTEM_ADD_ONS_MEDIA) ;
-AddFilesToPackage $(haikuPackage) : system add-ons media plugins
+AddFilesToPackage $(haikuPackage) : add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToPackage $(haikuPackage) : add-ons media plugins
 	: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons Tracker
+AddFilesToPackage $(haikuPackage) : add-ons Tracker
 	: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
 	Open\ Terminal-T ZipOMatic-Z ;
-AddSymlinkToPackage $(haikuPackage) : system add-ons Tracker
+AddSymlinkToPackage $(haikuPackage) : add-ons Tracker
 	: /boot/system/preferences/Backgrounds : Background-B ;
-AddSymlinkToPackage $(haikuPackage) : system add-ons Tracker
+AddSymlinkToPackage $(haikuPackage) : add-ons Tracker
 	: /boot/system/apps/TextSearch : TextSearch-G ;
-AddSymlinkToPackage $(haikuPackage) : system add-ons Tracker
+AddSymlinkToPackage $(haikuPackage) : add-ons Tracker
 	: /boot/system/apps/DiskUsage : DiskUsage-I ;
-AddFilesToPackage $(haikuPackage) : system add-ons input_server devices
+AddFilesToPackage $(haikuPackage) : add-ons input_server devices
 	: <input>keyboard <input>mouse <input>tablet <input>wacom ;
-AddFilesToPackage $(haikuPackage) : system add-ons input_server filters
+AddFilesToPackage $(haikuPackage) : add-ons input_server filters
 	: screen_saver shortcut_catcher ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel network
+AddFilesToPackage $(haikuPackage) : add-ons kernel network
 	: <net>notifications stack ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel network devices
+AddFilesToPackage $(haikuPackage) : add-ons kernel network devices
 	: $(SYSTEM_NETWORK_DEVICES) ;
-AddFilesToPackage $(haikuPackage) :
-	system add-ons kernel network datalink_protocols
+AddFilesToPackage $(haikuPackage) : add-ons kernel network datalink_protocols
 	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel network ppp
+AddFilesToPackage $(haikuPackage) : add-ons kernel network ppp
 	: $(SYSTEM_NETWORK_PPP) ;
-AddFilesToPackage $(haikuPackage) : system add-ons kernel network protocols
+AddFilesToPackage $(haikuPackage) : add-ons kernel network protocols
 	: $(SYSTEM_NETWORK_PROTOCOLS) ;
-AddFilesToPackage $(haikuPackage) : system add-ons Print
+AddFilesToPackage $(haikuPackage) : add-ons Print
 	: $(SYSTEM_ADD_ONS_PRINT) ;
-AddFilesToPackage $(haikuPackage) : system add-ons Print transport
+AddFilesToPackage $(haikuPackage) : add-ons Print transport
 	: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToPackage $(haikuPackage) : system add-ons Screen\ Savers
+AddFilesToPackage $(haikuPackage) : add-ons Screen\ Savers
 	: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
-AddFilesToPackage $(haikuPackage) : system add-ons disk_systems
+AddFilesToPackage $(haikuPackage) : add-ons disk_systems
 	: <disk_system>intel <disk_system>bfs ;
 
 
-AddDirectoryToPackage $(haikuPackage) : system data synth ;
-AddDirectoryToPackage $(haikuPackage) : system add-ons input_server methods ;
+AddDirectoryToPackage $(haikuPackage) : data synth ;
+AddDirectoryToPackage $(haikuPackage) : add-ons input_server methods ;
 
 # optional
-AddFilesToPackage $(haikuPackage) : optional system add-ons input_server methods
+# TODO: We should probably build another package that can be installed, if
+# desired.
+AddFilesToPackage $(haikuPackage) : optional add-ons input_server methods
 	: canna ;
 
 
 # PDF Writer enconding files
-CopyDirectoryToPackage $(haikuPackage) : system data
+CopyDirectoryToPackage $(haikuPackage) : data
 	: [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
 	: "PDF Writer" : -x .svn -x Jamfile ;
 
 # licenses
-CopyDirectoryToPackage $(haikuPackage) : system data
+CopyDirectoryToPackage $(haikuPackage) : data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses : -x .svn ;
 
 # Copy documentation as per DiskUsage's license requirement.
-CopyDirectoryToPackage $(haikuPackage) : system documentation
+CopyDirectoryToPackage $(haikuPackage) : documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
 	: diskusage : -x .svn ;
 
 # Copy documentation as per PDFlib Lite's license requirement.
-CopyDirectoryToPackage $(haikuPackage) : system documentation
+CopyDirectoryToPackage $(haikuPackage) : documentation
 	: [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
 	: pdflib : -x .svn ;