diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
index 143d6269de8..ee7451715c7 100644
--- a/reactos/subsys/system/directory.xml
+++ b/reactos/subsys/system/directory.xml
@@ -22,6 +22,9 @@
 <directory name="format">
 	<xi:include href="format/format.xml" />
 </directory>
+<directory name="lsass">
+	<xi:include href="lsass/lsass.xml" />
+</directory>
 <directory name="msiexec">
 	<xi:include href="msiexec/msiexec.xml" />
 </directory>
diff --git a/reactos/subsys/system/lsass/lsass.c b/reactos/subsys/system/lsass/lsass.c
index 52df623845c..8114fb649d5 100644
--- a/reactos/subsys/system/lsass/lsass.c
+++ b/reactos/subsys/system/lsass/lsass.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * reactos/subsys/system/lsass/lsass.c
  *
  * ReactOS Operating System
@@ -27,9 +26,13 @@
  * 		Compiled successfully with egcs 1.1.2
  */
 #include <windows.h>
-#include NTOS_MODE_USER
+#include <ntsecapi.h>
+#define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+
 #include <lsass/lsasrv.h>
+//#include <samsrv.h>
+#include <lsass/lsass.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -46,6 +49,7 @@ WinMain(HINSTANCE hInstance,
   DPRINT("Local Security Authority Subsystem\n");
   DPRINT("  Initializing...\n");
 
+  /* Initialize the LSA server DLL. */
   Status = LsapInitLsa();
   if (!NT_SUCCESS(Status))
   {
@@ -53,8 +57,20 @@ WinMain(HINSTANCE hInstance,
     goto ByeBye;
   }
 
+#if 0
+  /* Initialize the SAM server DLL. */
+  Status = SamIInitialize();
+  if (!NT_SUCCESS(Status))
+  {
+    DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status);
+    goto ByeBye;
+  }
+#endif
+
   /* FIXME: More initialization */
 
+  DPRINT("  Done...\n");
+
 ByeBye:
   NtTerminateThread(NtCurrentThread(), Status);
 
diff --git a/reactos/subsys/system/lsass/lsass.xml b/reactos/subsys/system/lsass/lsass.xml
new file mode 100644
index 00000000000..d99116a1e44
--- /dev/null
+++ b/reactos/subsys/system/lsass/lsass.xml
@@ -0,0 +1,10 @@
+<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe">
+	<include base="lsass">.</include>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
+	<library>ntdll</library>
+	<library>lsasrv</library>
+	<file>lsass.c</file>
+	<file>lsass.rc</file>
+</module>