diff --git a/data/launch/system b/data/launch/system
index b777b47068..fddac8f402 100644
--- a/data/launch/system
+++ b/data/launch/system
@@ -64,7 +64,7 @@ service x-vnd.Haiku-cddb_daemon {
 service x-vnd.Haiku-print_server {
 	launch /system/servers/print_server
 	no_safemode
-	legacy
+	on_demand
 }
 
 service x-vnd.Haiku-notification_server {
diff --git a/src/servers/print/Jamfile b/src/servers/print/Jamfile
index 1d9fdfbd4e..847a05d399 100644
--- a/src/servers/print/Jamfile
+++ b/src/servers/print/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src servers print ;
 
-UsePrivateHeaders shared print ;
+UsePrivateHeaders app shared print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources print_server :
diff --git a/src/servers/print/PrintServerApp.cpp b/src/servers/print/PrintServerApp.cpp
index f591781804..4a5be6e316 100644
--- a/src/servers/print/PrintServerApp.cpp
+++ b/src/servers/print/PrintServerApp.cpp
@@ -79,7 +79,7 @@ main()
 */
 PrintServerApp::PrintServerApp(status_t* err)
 	:
-	Inherited(PSRV_SIGNATURE_TYPE, err),
+	Inherited(PSRV_SIGNATURE_TYPE, true, err),
 	fDefaultPrinter(NULL),
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	fIconSize(0),
diff --git a/src/servers/print/PrintServerApp.h b/src/servers/print/PrintServerApp.h
index a0a83a3333..d4c5a16774 100644
--- a/src/servers/print/PrintServerApp.h
+++ b/src/servers/print/PrintServerApp.h
@@ -10,10 +10,10 @@
 #define _PRINT_SERVER_APP_H
 
 
-#include <Application.h>
 #include <Bitmap.h>
 #include <Catalog.h>
 #include <OS.h>
+#include <Server.h>
 #include <String.h>
 
 #include "FolderWatcher.h"
@@ -30,9 +30,9 @@ extern BLocker *gLock;
 
 
 // The print_server application.
-class PrintServerApp : public BApplication, public FolderListener {
+class PrintServerApp : public BServer, public FolderListener {
 private:
-		typedef BApplication Inherited;
+		typedef BServer Inherited;
 
 public:
 								PrintServerApp(status_t* error);