diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 8657ca896e9..be81a109e99 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -371,7 +371,6 @@ SYMLINKS_SO = \
 	stdole32.tlb.so \
 	sti.dll.so \
 	tapi32.dll.so \
-	ttydrv.dll.so \
 	twain_32.dll.so \
 	unicows.dll.so \
 	url.dll.so \
@@ -396,6 +395,7 @@ SYMLINKS_SO = \
 	winenas.drv.so \
 	wineoss.drv.so \
 	wineps.dll.so \
+	winetty.drv.so \
 	wininet.dll.so \
 	winmm.dll.so \
 	winnls32.dll.so \
@@ -418,6 +418,9 @@ symlinks.so: $(SYMLINKS_SO)
 
 symlinks: $(BUILDSUBDIRS)
 
+x11drv.dll.so: winex11.drv.so
+	$(RM) $@ && $(LN_S) winex11.drv.so $@
+
 
 # Map symlink name to the corresponding library
 
@@ -845,9 +848,6 @@ sti.dll.so: sti/sti.dll.so
 tapi32.dll.so: tapi32/tapi32.dll.so
 	$(RM) $@ && $(LN_S) tapi32/tapi32.dll.so $@
 
-ttydrv.dll.so: ttydrv/ttydrv.dll.so
-	$(RM) $@ && $(LN_S) ttydrv/ttydrv.dll.so $@
-
 twain_32.dll.so: twain/twain_32.dll.so
 	$(RM) $@ && $(LN_S) twain/twain_32.dll.so $@
 
@@ -942,6 +942,12 @@ wineps.dll.so: wineps/wineps.dll.so
 wineps16.drv.so : wineps.dll.so
 	$(RM) $@ && $(LN_S) wineps.dll.so $@
 
+winetty.drv.so: ttydrv/winetty.drv.so
+	$(RM) $@ && $(LN_S) ttydrv/winetty.drv.so $@
+
+winex11.drv.so: x11drv/winex11.drv.so
+	$(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@
+
 wininet.dll.so: wininet/wininet.dll.so
 	$(RM) $@ && $(LN_S) wininet/wininet.dll.so $@
 
@@ -990,9 +996,6 @@ wsock32.dll.so: wsock32/wsock32.dll.so
 wtsapi32.dll.so: wtsapi32/wtsapi32.dll.so
 	$(RM) $@ && $(LN_S) wtsapi32/wtsapi32.dll.so $@
 
-x11drv.dll.so: x11drv/x11drv.dll.so
-	$(RM) $@ && $(LN_S) x11drv/x11drv.dll.so $@
-
 libdxerr8.a: dxerr8/libdxerr8.a
 	$(RM) $@ && $(LN_S) dxerr8/libdxerr8.a $@
 
@@ -1119,7 +1122,6 @@ IMPORT_LIBS = \
 	libsnmpapi.$(IMPLIBEXT) \
 	libsti.$(IMPLIBEXT) \
 	libtapi32.$(IMPLIBEXT) \
-	libttydrv.$(IMPLIBEXT) \
 	libtwain_32.$(IMPLIBEXT) \
 	libunicows.$(IMPLIBEXT) \
 	liburl.$(IMPLIBEXT) \
@@ -1143,7 +1145,6 @@ IMPORT_LIBS = \
 	libws2_32.$(IMPLIBEXT) \
 	libwsock32.$(IMPLIBEXT) \
 	libwtsapi32.$(IMPLIBEXT) \
-	libx11drv.$(IMPLIBEXT) \
 	libdxerr8.a \
 	libdxerr9.a \
 	libdxguid.a \
@@ -1687,11 +1688,6 @@ libtapi32.def: tapi32/tapi32.spec.def
 libtapi32.a: tapi32/tapi32.spec.def
 	$(DLLTOOL) -k -l $@ -d tapi32/tapi32.spec.def
 
-libttydrv.def: ttydrv/ttydrv.spec.def
-	$(RM) $@ && $(LN_S) ttydrv/ttydrv.spec.def $@
-libttydrv.a: ttydrv/ttydrv.spec.def
-	$(DLLTOOL) -k -l $@ -d ttydrv/ttydrv.spec.def
-
 libtwain_32.def: twain/twain_32.spec.def
 	$(RM) $@ && $(LN_S) twain/twain_32.spec.def $@
 libtwain_32.a: twain/twain_32.spec.def
@@ -1807,11 +1803,6 @@ libwtsapi32.def: wtsapi32/wtsapi32.spec.def
 libwtsapi32.a: wtsapi32/wtsapi32.spec.def
 	$(DLLTOOL) -k -l $@ -d wtsapi32/wtsapi32.spec.def
 
-libx11drv.def: x11drv/x11drv.spec.def
-	$(RM) $@ && $(LN_S) x11drv/x11drv.spec.def $@
-libx11drv.a: x11drv/x11drv.spec.def
-	$(DLLTOOL) -k -l $@ -d x11drv/x11drv.spec.def
-
 advapi32/advapi32.spec.def: $(WINEBUILD)
 advpack/advpack.spec.def: $(WINEBUILD)
 amstream/amstream.spec.def: $(WINEBUILD)
@@ -1919,7 +1910,6 @@ shlwapi/shlwapi.spec.def: $(WINEBUILD)
 snmpapi/snmpapi.spec.def: $(WINEBUILD)
 sti/sti.spec.def: $(WINEBUILD)
 tapi32/tapi32.spec.def: $(WINEBUILD)
-ttydrv/ttydrv.spec.def: $(WINEBUILD)
 twain/twain_32.spec.def: $(WINEBUILD)
 unicows/unicows.spec.def: $(WINEBUILD)
 url/url.spec.def: $(WINEBUILD)
@@ -1943,7 +1933,6 @@ wow32/wow32.spec.def: $(WINEBUILD)
 winsock/ws2_32.spec.def: $(WINEBUILD)
 wsock32/wsock32.spec.def: $(WINEBUILD)
 wtsapi32/wtsapi32.spec.def: $(WINEBUILD)
-x11drv/x11drv.spec.def: $(WINEBUILD)
 
 $(BUILDSUBDIRS): $(IMPORT_LIBS)
 $(INSTALLSUBDIRS:%=%/__install__): $(IMPORT_LIBS)
@@ -2074,7 +2063,6 @@ snmpapi/snmpapi.dll.so: snmpapi
 stdole32.tlb/stdole32.tlb.so: stdole32.tlb
 sti/sti.dll.so: sti
 tapi32/tapi32.dll.so: tapi32
-ttydrv/ttydrv.dll.so: ttydrv
 twain/twain_32.dll.so: twain
 unicows/unicows.dll.so: unicows
 url/url.dll.so: url
@@ -2100,6 +2088,8 @@ msacm/winemp3/winemp3.acm.so: msacm/winemp3
 winmm/winenas/winenas.drv.so: winmm/winenas
 winmm/wineoss/wineoss.drv.so: winmm/wineoss
 wineps/wineps.dll.so: wineps
+ttydrv/winetty.drv.so: ttydrv
+x11drv/winex11.drv.so: x11drv
 wininet/wininet.dll.so: wininet
 winmm/winmm.dll.so: winmm
 winnls/winnls32.dll.so: winnls
@@ -2111,7 +2101,6 @@ wow32/wow32.dll.so: wow32
 winsock/ws2_32.dll.so: winsock
 wsock32/wsock32.dll.so: wsock32
 wtsapi32/wtsapi32.dll.so: wtsapi32
-x11drv/x11drv.dll.so: x11drv
 dxerr8/libdxerr8.a: dxerr8
 dxerr9/libdxerr9.a: dxerr9
 dxguid/libdxguid.a: dxguid
diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
index 8c49d0f4cb8..52b8f1fcd5f 100644
--- a/dlls/d3d8/d3d8_main.c
+++ b/dlls/d3d8/d3d8_main.c
@@ -76,7 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 
        DisableThreadLibraryCalls(hInstDLL);
 
-       mod = GetModuleHandleA( "x11drv.dll" );
+       mod = GetModuleHandleA( "winex11.drv" );
        if (mod)
        {
            wine_tsx11_lock_ptr   = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index 5eba575a5bc..0e4f7fe0cbe 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
@@ -59,7 +59,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) {
 
         DisableThreadLibraryCalls(hInstDLL);
 
-        mod = GetModuleHandleA( "x11drv.dll" );
+        mod = GetModuleHandleA( "winex11.drv" );
         if (mod)
         {
             wine_tsx11_lock_ptr   = (void*) GetProcAddress(mod, "wine_tsx11_lock");
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index c6ae4583404..afa7acbe7c3 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -654,7 +654,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 
         DisableThreadLibraryCalls(hInstDLL);
 
-        mod = GetModuleHandleA( "x11drv.dll" );
+        mod = GetModuleHandleA( "winex11.drv" );
         if (mod)
         {
             wine_tsx11_lock_ptr   = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index 06d569f1075..d0bf253c326 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -24,6 +24,7 @@
 
 #include <stdarg.h>
 #include <string.h>
+#include <stdio.h>
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
@@ -210,7 +211,7 @@ static struct graphics_driver *create_driver( HMODULE module )
  */
 static struct graphics_driver *load_display_driver(void)
 {
-    char buffer[MAX_PATH], *name, *next;
+    char buffer[MAX_PATH], libname[32], *name, *next;
     HMODULE module = 0;
     HKEY hkey;
 
@@ -220,11 +221,11 @@ static struct graphics_driver *load_display_driver(void)
         return display_driver;
     }
 
-    strcpy( buffer, "x11drv,ttydrv" );  /* default value */
-    if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
+    strcpy( buffer, "x11,tty" );  /* default value */
+    if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey ))
     {
         DWORD type, count = sizeof(buffer);
-        RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
+        RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count );
         RegCloseKey( hkey );
     }
 
@@ -234,13 +235,14 @@ static struct graphics_driver *load_display_driver(void)
         next = strchr( name, ',' );
         if (next) *next++ = 0;
 
-        if ((module = LoadLibraryA( name )) != 0) break;
+        snprintf( libname, sizeof(libname), "wine%s.drv", name );
+        if ((module = LoadLibraryA( libname )) != 0) break;
         name = next;
     }
     if (!module)
     {
         MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
-        if (!strcasecmp( buffer, "x11drv" ))
+        if (!strcasecmp( buffer, "x11" ))
             MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
         ExitProcess(1);
     }
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index d5ac708e717..55c421dcfaa 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -140,7 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
             DisableThreadLibraryCalls(hInstDLL);
             hImeInst = hInstDLL;
             IMM_RegisterMessages();
-            x11drv = GetModuleHandleA("x11drv.dll");
+            x11drv = GetModuleHandleA("winex11.drv");
             if (x11drv) pX11DRV_ForceXIMReset = (void *)GetProcAddress( x11drv, "ForceXIMReset");
             break;
         case DLL_PROCESS_DETACH:
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 08f333f8002..818b2c4014e 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -187,6 +187,9 @@ symlinks.so: \$(SYMLINKS_SO)
 
 symlinks: \$(BUILDSUBDIRS)
 
+x11drv.dll.so: winex11.drv.so
+	\$(RM) \$@ && \$(LN_S) winex11.drv.so \$@
+
 EOF
 
 ################################################################
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 32f5f871209..c3f7406044a 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -817,7 +817,7 @@ static BOOL process_attach(void)
   HDC hdc;
   XVisualInfo *vis = NULL;
   Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" );
-  HMODULE mod = GetModuleHandleA( "x11drv.dll" );
+  HMODULE mod = GetModuleHandleA( "winex11.drv" );
   void *opengl_handle;
   DWORD size = sizeof(internal_gl_disabled_extensions);
   HKEY hkey = 0;
diff --git a/dlls/ttydrv/.cvsignore b/dlls/ttydrv/.cvsignore
index 302fbefae11..a9873cce5c8 100644
--- a/dlls/ttydrv/.cvsignore
+++ b/dlls/ttydrv/.cvsignore
@@ -1,3 +1,2 @@
 Makefile
-ttydrv.dll.dbg.c
-ttydrv.spec.def
+winetty.drv.dbg.c
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in
index 477ae812014..b7bfff6b617 100644
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = ttydrv.dll
+MODULE    = winetty.drv
 IMPORTS   = user32 gdi32 kernel32 ntdll
 EXTRALIBS = @CURSESLIBS@
 
diff --git a/dlls/ttydrv/ttydrv.spec b/dlls/ttydrv/winetty.drv.spec
similarity index 100%
rename from dlls/ttydrv/ttydrv.spec
rename to dlls/ttydrv/winetty.drv.spec
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index 25674b892f7..66bb888e2a4 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -19,6 +19,7 @@
  */
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
@@ -63,14 +64,14 @@ extern void WDML_NotifyThreadDetach(void);
 /* load the graphics driver */
 static BOOL load_driver(void)
 {
-    char buffer[MAX_PATH], *name, *next;
+    char buffer[MAX_PATH], libname[32], *name, *next;
     HKEY hkey;
 
-    strcpy( buffer, "x11drv,ttydrv" );  /* default value */
-    if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
+    strcpy( buffer, "x11,tty" );  /* default value */
+    if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drivers", &hkey ))
     {
         DWORD type, count = sizeof(buffer);
-        RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
+        RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count );
         RegCloseKey( hkey );
     }
 
@@ -80,13 +81,14 @@ static BOOL load_driver(void)
         next = strchr( name, ',' );
         if (next) *next++ = 0;
 
-        if ((graphics_driver = LoadLibraryA( name )) != 0) break;
+        snprintf( libname, sizeof(libname), "wine%s.drv", name );
+        if ((graphics_driver = LoadLibraryA( libname )) != 0) break;
         name = next;
     }
     if (!graphics_driver)
     {
         MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
-        if (!strcasecmp( buffer, "x11drv" ))
+        if (!strcasecmp( buffer, "x11" ))
             MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
         ExitProcess(1);
     }
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 15015212c35..d0f5a03541d 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -58,7 +58,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 
        DisableThreadLibraryCalls(hInstDLL);
 
-       mod = GetModuleHandleA( "x11drv.dll" );
+       mod = GetModuleHandleA( "winex11.drv" );
        if (mod)
        {
            wine_tsx11_lock_ptr   = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c
index 556ead71982..c741a8c22dd 100644
--- a/dlls/wintab32/wintab32.c
+++ b/dlls/wintab32/wintab32.c
@@ -74,7 +74,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
         case DLL_PROCESS_ATTACH:
             TRACE("Initialization\n");
             InitializeCriticalSection(&csTablet);
-            hx11drv = GetModuleHandleA("x11drv.dll");
+            hx11drv = GetModuleHandleA("winex11.drv");
             if (hx11drv)
             {
                 pLoadTabletInfo = (void *)GetProcAddress(hx11drv, "LoadTabletInfo");
diff --git a/dlls/x11drv/.cvsignore b/dlls/x11drv/.cvsignore
index eb19f3afc61..5da1746269b 100644
--- a/dlls/x11drv/.cvsignore
+++ b/dlls/x11drv/.cvsignore
@@ -1,3 +1,2 @@
 Makefile
-x11drv.dll.dbg.c
-x11drv.spec.def
+winex11.drv.dbg.c
diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in
index c708b783e04..294b6596f15 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = x11drv.dll
+MODULE    = winex11.drv
 IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = $(LIBUNICODE) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/winex11.drv.spec
similarity index 100%
rename from dlls/x11drv/x11drv.spec
rename to dlls/x11drv/winex11.drv.spec
diff --git a/documentation/samples/config b/documentation/samples/config
index b2f5f3855d3..07c6135803d 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -6,7 +6,6 @@ WINE REGISTRY Version 2
 ;; grep -v "^;" ~/.wine/config | grep '.'
 
 [wine]
-"GraphicsDriver" = "x11drv"
 ;"ShowDirSymlinks" = "1"
 ;"ShowDotFiles" = "1"