diff --git a/src/servers/syslog_daemon/SyslogDaemon.cpp b/src/servers/syslog_daemon/SyslogDaemon.cpp
index bb3796086e..02abaa2ece 100644
--- a/src/servers/syslog_daemon/SyslogDaemon.cpp
+++ b/src/servers/syslog_daemon/SyslogDaemon.cpp
@@ -33,7 +33,7 @@ static const int32 kQuitDaemon = 'quit';
 
 SyslogDaemon::SyslogDaemon()
 	:
-	BApplication(B_SYSTEM_LOGGER_SIGNATURE),
+	BServer(B_SYSTEM_LOGGER_SIGNATURE, false, NULL),
 	fHandlerLock("handler lock")
 {
 }
diff --git a/src/servers/syslog_daemon/SyslogDaemon.h b/src/servers/syslog_daemon/SyslogDaemon.h
index b544762fb9..aee539faa6 100644
--- a/src/servers/syslog_daemon/SyslogDaemon.h
+++ b/src/servers/syslog_daemon/SyslogDaemon.h
@@ -6,9 +6,9 @@
 #define _SYSLOG_DAEMON_H_
 
 
-#include <Application.h>
 #include <Locker.h>
 #include <List.h>
+#include <Server.h>
 #include <OS.h>
 
 #include <syslog_daemon.h>
@@ -17,7 +17,7 @@
 typedef void (*handler_func)(syslog_message&);
 
 
-class SyslogDaemon : public BApplication {
+class SyslogDaemon : public BServer {
 public:
 								SyslogDaemon();