diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 3839f3f2f9..baeb7ded34 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -28,11 +28,11 @@ BEOS_BIN = addattr alert arp basename beep cat catattr chgrp chmod chop chown cl
 
 BEOS_APPS = Terminal Expander People ShowImage Clock Pulse
 	Playground SoundRecorder BitmapDrawing Magnify DiskProbe AboutHaiku
-	StyledEdit Chart
+	StyledEdit Chart Workspaces
 ;
 BEOS_PREFERENCES = Backgrounds DataTranslations FileTypes Fonts Media Menu
 	Mouse Keyboard Keymap Screen ScrollBar Sounds Time VirtualMemory
-	Workspaces ScreenSaver
+	ScreenSaver
 ;
 BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libnet.so libmedia.so libtracker.so
 	libtranslation.so libnetwork.so libbind.so libnetapi.so libsocket.so libdebug.so
diff --git a/src/apps/Jamfile b/src/apps/Jamfile
index eb66ed40ef..cd238d5a65 100644
--- a/src/apps/Jamfile
+++ b/src/apps/Jamfile
@@ -21,3 +21,4 @@ SubInclude HAIKU_TOP src apps soundrecorder ;
 SubInclude HAIKU_TOP src apps stylededit ;
 SubInclude HAIKU_TOP src apps terminal ;
 SubInclude HAIKU_TOP src apps tracker ;
+SubInclude HAIKU_TOP src apps workspaces ;
diff --git a/src/preferences/workspaces/Jamfile b/src/apps/workspaces/Jamfile
similarity index 78%
rename from src/preferences/workspaces/Jamfile
rename to src/apps/workspaces/Jamfile
index 49974584d5..43fb643d9d 100644
--- a/src/preferences/workspaces/Jamfile
+++ b/src/apps/workspaces/Jamfile
@@ -1,9 +1,9 @@
-SubDir HAIKU_TOP src preferences workspaces ;
+SubDir HAIKU_TOP src apps workspaces ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 AddSubDirSupportedPlatforms libbe_test ;
 
-Preference Workspaces : 
+Application Workspaces :
 	Workspaces.cpp 
 	: be
 	: Workspaces.rdef 
diff --git a/src/preferences/workspaces/Workspaces.cpp b/src/apps/workspaces/Workspaces.cpp
similarity index 100%
rename from src/preferences/workspaces/Workspaces.cpp
rename to src/apps/workspaces/Workspaces.cpp
diff --git a/src/preferences/workspaces/Workspaces.rdef b/src/apps/workspaces/Workspaces.rdef
similarity index 100%
rename from src/preferences/workspaces/Workspaces.rdef
rename to src/apps/workspaces/Workspaces.rdef
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index 8677d95da8..497929fdb0 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -22,4 +22,3 @@ SubInclude HAIKU_TOP src preferences scrollbar ;
 SubInclude HAIKU_TOP src preferences sounds ;
 SubInclude HAIKU_TOP src preferences time ;
 SubInclude HAIKU_TOP src preferences virtualmemory ;
-SubInclude HAIKU_TOP src preferences workspaces ;