diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 96dbbb94a2..74277d2969 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -52,7 +52,7 @@ BEOS_APPS = AboutSystem CodyCam DeskCalc DiskProbe CDPlayer Expander
 	NetworkStatus PackageInstaller People PowerStatus ProcessController
 	ShowImage SoundRecorder StyledEdit Terminal TV Workspaces
 ;
-BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
+BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail DriveSetup
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
 	ScreenSaver Sounds Time VirtualMemory
 ;
@@ -164,7 +164,7 @@ AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;
 AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
-AddDriversToHaikuImage input		: ps2_hid usb_hid ;
+AddDriversToHaikuImage input		: ps2_hid usb_hid wacom ;
 AddDriversToHaikuImage misc			: <driver>poke <driver>test ;
 AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
 #AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
@@ -382,7 +382,7 @@ AddFilesToHaikuImage beos system add-ons Tracker : FileType-F ZipOMatic-Z ;
 AddSymlinkToHaikuImage beos system add-ons Tracker
 	: /boot/beos/preferences/Backgrounds : Background-B ;
 AddFilesToHaikuImage beos system add-ons input_server devices
-	: <input>keyboard <input>mouse ;
+	: <input>keyboard <input>mouse <input>wacom ;
 AddFilesToHaikuImage beos system add-ons input_server filters : screen_saver ;
 AddFilesToHaikuImage beos system add-ons kernel network
 	: stack socket ;
@@ -507,6 +507,18 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
 		: /boot/home/config/bin/links ;
 }
 
+# Pe text editor
+if [ IsOptionalHaikuImagePackageAdded Pe ] {
+	InstallOptionalHaikuImagePackage Pe
+		: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
+		: apps
+	;
+	AddSymlinkToHaikuImage home config be Applications
+		: /boot/apps/pe-2.4-x86/pe ;
+	AddSymlinkToHaikuImage home config bin
+		: /boot/apps/pe-2.4-x86/lpe ;
+}
+
 #pragma mark - Build The Image