diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d5a5172fc6..4734eb4fda 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -47,12 +47,12 @@ BEOS_BIN = "[" addattr alert arp base64 basename bc beep bison bzip2 cal cat
 ;
 
 	
-BEOS_APPS = AboutSystem CodyCam DeskCalc DiskProbe CDPlayer Expander
+BEOS_APPS = AboutSystem CodyCam DeskCalc DiskProbe DriveSetup CDPlayer Expander
 	Icon-O-Matic Installer LaunchBox Magnify Mail MediaPlayer MidiPlayer
 	NetworkStatus PackageInstaller People PowerStatus ProcessController
 	ShowImage SoundRecorder StyledEdit Terminal TV Workspaces
 ;
-BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail DriveSetup
+BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
 	ScreenSaver Sounds Time VirtualMemory
 ;
@@ -209,6 +209,8 @@ AddSymlinkToHaikuImage home config be Applications
 					: /boot/beos/apps/DeskCalc : DeskCalc ;
 AddSymlinkToHaikuImage home config be Applications
 					: /boot/beos/apps/DiskProbe : DiskProbe ;
+AddSymlinkToHaikuImage home config be Applications
+					: /boot/beos/apps/DriveSetup : DriveSetup ;
 AddSymlinkToHaikuImage home config be Applications
 					: /boot/beos/apps/Icon-O-Matic : Icon-O-Matic ;
 AddSymlinkToHaikuImage home config be Applications
diff --git a/src/apps/Jamfile b/src/apps/Jamfile
index 1838522737..7631470501 100644
--- a/src/apps/Jamfile
+++ b/src/apps/Jamfile
@@ -10,6 +10,7 @@ SubInclude HAIKU_TOP src apps cortex ;
 SubInclude HAIKU_TOP src apps deskbar ;
 SubInclude HAIKU_TOP src apps deskcalc ;
 SubInclude HAIKU_TOP src apps diskprobe ;
+SubInclude HAIKU_TOP src apps drivesetup ;
 SubInclude HAIKU_TOP src apps expander ;
 SubInclude HAIKU_TOP src apps fontdemo ;
 SubInclude HAIKU_TOP src apps glteapot ;
diff --git a/src/preferences/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
similarity index 100%
rename from src/preferences/drivesetup/DiskView.cpp
rename to src/apps/drivesetup/DiskView.cpp
diff --git a/src/preferences/drivesetup/DiskView.h b/src/apps/drivesetup/DiskView.h
similarity index 100%
rename from src/preferences/drivesetup/DiskView.h
rename to src/apps/drivesetup/DiskView.h
diff --git a/src/preferences/drivesetup/DriveSetup.cpp b/src/apps/drivesetup/DriveSetup.cpp
similarity index 100%
rename from src/preferences/drivesetup/DriveSetup.cpp
rename to src/apps/drivesetup/DriveSetup.cpp
diff --git a/src/preferences/drivesetup/DriveSetup.h b/src/apps/drivesetup/DriveSetup.h
similarity index 100%
rename from src/preferences/drivesetup/DriveSetup.h
rename to src/apps/drivesetup/DriveSetup.h
diff --git a/src/preferences/drivesetup/DriveSetup.rdef b/src/apps/drivesetup/DriveSetup.rdef
similarity index 100%
rename from src/preferences/drivesetup/DriveSetup.rdef
rename to src/apps/drivesetup/DriveSetup.rdef
diff --git a/src/preferences/drivesetup/InitParamsPanel.cpp b/src/apps/drivesetup/InitParamsPanel.cpp
similarity index 100%
rename from src/preferences/drivesetup/InitParamsPanel.cpp
rename to src/apps/drivesetup/InitParamsPanel.cpp
diff --git a/src/preferences/drivesetup/InitParamsPanel.h b/src/apps/drivesetup/InitParamsPanel.h
similarity index 100%
rename from src/preferences/drivesetup/InitParamsPanel.h
rename to src/apps/drivesetup/InitParamsPanel.h
diff --git a/src/preferences/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile
similarity index 100%
rename from src/preferences/drivesetup/Jamfile
rename to src/apps/drivesetup/Jamfile
diff --git a/src/preferences/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
similarity index 100%
rename from src/preferences/drivesetup/MainWindow.cpp
rename to src/apps/drivesetup/MainWindow.cpp
diff --git a/src/preferences/drivesetup/MainWindow.h b/src/apps/drivesetup/MainWindow.h
similarity index 100%
rename from src/preferences/drivesetup/MainWindow.h
rename to src/apps/drivesetup/MainWindow.h
diff --git a/src/preferences/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp
similarity index 100%
rename from src/preferences/drivesetup/PartitionList.cpp
rename to src/apps/drivesetup/PartitionList.cpp
diff --git a/src/preferences/drivesetup/PartitionList.h b/src/apps/drivesetup/PartitionList.h
similarity index 100%
rename from src/preferences/drivesetup/PartitionList.h
rename to src/apps/drivesetup/PartitionList.h
diff --git a/src/preferences/drivesetup/Support.cpp b/src/apps/drivesetup/Support.cpp
similarity index 100%
rename from src/preferences/drivesetup/Support.cpp
rename to src/apps/drivesetup/Support.cpp
diff --git a/src/preferences/drivesetup/Support.h b/src/apps/drivesetup/Support.h
similarity index 100%
rename from src/preferences/drivesetup/Support.h
rename to src/apps/drivesetup/Support.h
diff --git a/src/preferences/drivesetup/TODO b/src/apps/drivesetup/TODO
similarity index 100%
rename from src/preferences/drivesetup/TODO
rename to src/apps/drivesetup/TODO
diff --git a/src/preferences/drivesetup/run b/src/apps/drivesetup/run
similarity index 100%
rename from src/preferences/drivesetup/run
rename to src/apps/drivesetup/run
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index 3d127a6486..f8f342d820 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -4,7 +4,6 @@ SubInclude HAIKU_TOP src preferences appearance ;
 SubInclude HAIKU_TOP src preferences backgrounds ;
 SubInclude HAIKU_TOP src preferences datatranslations ;
 SubInclude HAIKU_TOP src preferences devices ;
-SubInclude HAIKU_TOP src preferences drivesetup ;
 SubInclude HAIKU_TOP src preferences dun ;
 SubInclude HAIKU_TOP src preferences filetypes ;
 SubInclude HAIKU_TOP src preferences fonts ;