diff --git a/data/launch/user b/data/launch/user
index be034a92ba..7f4c538b2e 100644
--- a/data/launch/user
+++ b/data/launch/user
@@ -11,7 +11,6 @@ target desktop {
 
 	service x-vnd.Be-TSKB {
 		launch /system/Deskbar
-		legacy
 		on {
 			initial_volumes_mounted
 		}
diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index e5dc306a86..ed1c6f22bb 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -94,7 +94,7 @@ main()
 
 TBarApp::TBarApp()
 	:
-	BApplication(kDeskbarSignature),
+	BServer(kDeskbarSignature, true, NULL),
 	fSettingsFile(NULL),
 	fClockSettingsFile(NULL),
 	fPreferencesWindow(NULL)
diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h
index 62f16b451c..5a1465770f 100644
--- a/src/apps/deskbar/BarApp.h
+++ b/src/apps/deskbar/BarApp.h
@@ -36,7 +36,7 @@ All rights reserved.
 #define BAR_APP_H
 
 
-#include <Application.h>
+#include <Server.h>
 
 #include "BarSettings.h"
 
@@ -105,7 +105,7 @@ public:
 			BBitmap*				iconCache[kIconCacheCount];
 };
 
-class TBarApp : public BApplication {
+class TBarApp : public BServer {
 public:
 									TBarApp();
 	virtual							~TBarApp();