diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c
index d835b34..86f0d47 100644
--- a/daemon/gdm-x-session.c.orig
+++ b/daemon/gdm-x-session.c
@@ -240,7 +240,13 @@ spawn_x_server (State        *state,
 
         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
 
-        g_ptr_array_add (arguments, X_SERVER);
+        if (g_getenv ("GDM_X_SERVER") != NULL) {
+                g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER"));
+		g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER"));
+        } else {
+                g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER);
+                g_ptr_array_add (arguments, X_SERVER);
+        }
 
         if (vt_string != NULL) {
                 g_ptr_array_add (arguments, vt_string);