diff --git a/xorg/server/module/Makefile b/xorg/server/module/Makefile
index 70df8e72..65ede6d0 100644
--- a/xorg/server/module/Makefile
+++ b/xorg/server/module/Makefile
@@ -4,7 +4,7 @@ rdpCopyArea.o rdpCopyPlane.o rdpPolyPoint.o rdpPolylines.o rdpPolySegment.o \
 rdpPolyRectangle.o rdpPolyArc.o rdpFillPolygon.o rdpPolyFillRect.o \
 rdpPolyFillArc.o rdpPolyText8.o rdpPolyText16.o rdpImageText8.o \
 rdpImageText16.o rdpImageGlyphBlt.o rdpPolyGlyphBlt.o rdpPushPixels.o \
-rdpCursor.o
+rdpCursor.o rdpMain.o
 
 CFLAGS = -g -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1
 
diff --git a/xorg/server/module/rdpDraw.c b/xorg/server/module/rdpDraw.c
index ff8fdb7f..6495bf4a 100644
--- a/xorg/server/module/rdpDraw.c
+++ b/xorg/server/module/rdpDraw.c
@@ -39,14 +39,6 @@ misc draw calls
 
 #include "rdp.h"
 
-#define XRDP_DRIVER_NAME "XRDPDEV"
-#define XRDP_NAME "XRDPDEV"
-#define XRDP_VERSION 1000
-
-#define PACKAGE_VERSION_MAJOR 1
-#define PACKAGE_VERSION_MINOR 0
-#define PACKAGE_VERSION_PATCHLEVEL 0
-
 /******************************************************************************/
 #define LOG_LEVEL 1
 #define LLOGLN(_level, _args) \
@@ -126,36 +118,3 @@ rdpCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr pOldRegion)
     dev->pScreen->CopyWindow(pWin, ptOldOrg, pOldRegion);
     dev->pScreen->CopyWindow = rdpCopyWindow;
 }
-
-/*****************************************************************************/
-static pointer
-RDPSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
-{
-    static int initialised = 0;
-
-    LLOGLN(0, ("RDPSetup:"));
-    if (!initialised)
-    {
-        initialised = 1;
-    }
-    return (pointer) 1;
-}
-
-static MODULESETUPPROTO(RDPSetup);
-static XF86ModuleVersionInfo RDPVersRec =
-{
-    XRDP_DRIVER_NAME,
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    PACKAGE_VERSION_MAJOR,
-    PACKAGE_VERSION_MINOR,
-    PACKAGE_VERSION_PATCHLEVEL,
-    ABI_CLASS_VIDEODRV,
-    ABI_VIDEODRV_VERSION,
-    0,
-    { 0, 0, 0, 0 }
-};
-
-XF86ModuleData xorgxrdpModuleData = { &RDPVersRec, RDPSetup, NULL };
diff --git a/xorg/server/readme.txt b/xorg/server/readme.txt
index a6041f4d..6fc3aca6 100644
--- a/xorg/server/readme.txt
+++ b/xorg/server/readme.txt
@@ -10,6 +10,9 @@ copy xorg.conf into it
 copy xrdpdev_drv.so to /usr/lib/xorg/modules/drivers
 copy libxorgxrdp.so to /usr/lib/xorg/modules
 
+copy xrdpmouse_drv.so to /usr/lib/xorg/modules/input
+copy xrdpkeyb_drv.so to /usr/lib/xorg/modules/input
+
 strat xserver like this
 Xorg -modulepath /usr/lib/xorg/modules -config xrdp/xorg.conf -logfile /tmp/Xjay.log -novtswitch -sharevts -noreset -nohwaccess -ac :10
 
diff --git a/xorg/server/xrdpdev/xorg.conf b/xorg/server/xrdpdev/xorg.conf
index a44c92dd..2d6096fc 100644
--- a/xorg/server/xrdpdev/xorg.conf
+++ b/xorg/server/xrdpdev/xorg.conf
@@ -6,9 +6,9 @@ Section "ServerLayout"
     InputDevice "xrdpKeyboard" "CoreKeyboard"
 EndSection
 
-#Section "ServerFlags"
-#    Option "DontVTSwitch" "on"
-#EndSection
+Section "ServerFlags"
+    Option "DontVTSwitch" "off"
+EndSection
 
 Section "Files"
     FontPath "/usr/X11R6/lib/X11/fonts/misc/:unscaled"
@@ -31,7 +31,7 @@ EndSection
 
 Section "InputDevice"
     Identifier "xrdpKeyboard"
-    Driver  "xrdpkeyb"
+    Driver "xrdpkeyb"
 EndSection
 
 Section "InputDevice"
diff --git a/xorg/server/xrdpdev/xrdpdev.c b/xorg/server/xrdpdev/xrdpdev.c
index f4b2807a..ff00c0bd 100644
--- a/xorg/server/xrdpdev/xrdpdev.c
+++ b/xorg/server/xrdpdev/xrdpdev.c
@@ -531,9 +531,9 @@ _X_EXPORT DriverRec g_DriverRec =
 
 /*****************************************************************************/
 static pointer
-Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+xrdpdevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
-    LLOGLN(0, ("Setup:"));
+    LLOGLN(0, ("xrdpdevSetup:"));
     if (!g_setup_done)
     {
         g_setup_done = 1;
@@ -554,6 +554,6 @@ Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 _X_EXPORT XF86ModuleData xrdpdevModuleData =
 {
     &g_VersRec,
-    Setup,
+    xrdpdevSetup,
     0
 };