diff --git a/src/servers/registrar/Registrar.cpp b/src/servers/registrar/Registrar.cpp
index cbab9cb76c..aabbfe0881 100644
--- a/src/servers/registrar/Registrar.cpp
+++ b/src/servers/registrar/Registrar.cpp
@@ -42,7 +42,7 @@ static const bigtime_t kRosterSanityEventInterval = 1000000LL;
 		   error code.
 */
 Registrar::Registrar(status_t *error)
-		 : BApplication(kRegistrarSignature, error),
+		 : BServer(kRegistrarSignature, false, error),
 		   fRoster(NULL),
 		   fClipboardHandler(NULL),
 		   fMIMEManager(NULL),
diff --git a/src/servers/registrar/Registrar.h b/src/servers/registrar/Registrar.h
index b78a18f4f1..0f2cf1f429 100644
--- a/src/servers/registrar/Registrar.h
+++ b/src/servers/registrar/Registrar.h
@@ -26,7 +26,7 @@
 #ifndef REGISTRAR_H
 #define REGISTRAR_H
 
-#include <Application.h>
+#include <Server.h>
 
 class ClipboardHandler;
 class DiskDeviceManager;
@@ -39,7 +39,7 @@ namespace BPrivate {
 	class TRoster;
 };
 
-class Registrar : public BApplication {
+class Registrar : public BServer {
 public:
 	Registrar(status_t *error);
 	virtual ~Registrar();