diff --git a/base/services/srvsvc/precomp.h b/base/services/srvsvc/precomp.h
index c933646c034..a0fbcbc4bdd 100644
--- a/base/services/srvsvc/precomp.h
+++ b/base/services/srvsvc/precomp.h
@@ -9,6 +9,7 @@
 #include <winbase.h>
 #include <winreg.h>
 #include <winsvc.h>
+#include <lmserver.h>
 
 #include <srvsvc_s.h>
 
diff --git a/base/services/srvsvc/srvsvc.c b/base/services/srvsvc/srvsvc.c
index c37072f13ee..5182987d50a 100644
--- a/base/services/srvsvc/srvsvc.c
+++ b/base/services/srvsvc/srvsvc.c
@@ -127,6 +127,12 @@ ServiceInit(VOID)
     else
         CloseHandle(hThread);
 
+    /* Report a running server service */
+    SetServiceBits(ServiceStatusHandle,
+                   SV_TYPE_SERVER,
+                   TRUE,
+                   TRUE);
+
     return ERROR_SUCCESS;
 }
 
diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h
index 172411794d4..6e66ec76797 100644
--- a/base/services/wkssvc/precomp.h
+++ b/base/services/wkssvc/precomp.h
@@ -9,6 +9,7 @@
 #include <winbase.h>
 #include <winreg.h>
 #include <winsvc.h>
+#include <lmserver.h>
 
 #include <wkssvc_s.h>
 
diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c
index 198ce5a4700..5200570256b 100644
--- a/base/services/wkssvc/wkssvc.c
+++ b/base/services/wkssvc/wkssvc.c
@@ -127,6 +127,12 @@ ServiceInit(VOID)
     else
         CloseHandle(hThread);
 
+    /* Report a running workstation service */
+    SetServiceBits(ServiceStatusHandle,
+                   SV_TYPE_WORKSTATION,
+                   TRUE,
+                   TRUE);
+
     return ERROR_SUCCESS;
 }