diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 43ce876ec89..e0a70e903b6 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -237,7 +237,6 @@ static void setup_options(void)
 {
     char buffer[MAX_PATH+16];
     HKEY hkey, appkey = 0;
-    DWORD count;
 
     if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\x11drv", 0, NULL,
                          REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ))
@@ -262,19 +261,6 @@ static void setup_options(void)
         }
     }
 
-    /* get the display name */
-
-    strcpy( buffer, "DISPLAY=" );
-    count = sizeof(buffer) - 8;
-    if (!RegQueryValueExA( hkey, "display", 0, NULL, buffer + 8, &count ))
-    {
-        const char *display_name = getenv( "DISPLAY" );
-        if (display_name && strcmp( buffer, display_name ))
-            MESSAGE( "x11drv: Warning: $DISPLAY variable ignored, using '%s' specified in config file\n",
-                     buffer + 8 );
-        putenv( strdup(buffer) );
-    }
-
     if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) ))
     {
         /* Imperfect validation:  If Desktop=N, then we don't turn on
diff --git a/documentation/samples/config b/documentation/samples/config
index 9da612c075b..442edae5e29 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -116,8 +116,6 @@ WINE REGISTRY Version 2
 "PerfectGraphics" = "N"
 ; Color depth to use on multi-depth screens
 ;;"ScreenDepth" = "16"
-; Name of X11 display to use
-;;"Display" = ":0.0"
 ; Allow the window manager to manage created windows
 "Managed" = "Y"
 ; Use a desktop window of 640x480 for Wine