diff --git a/scheduler/client.c b/scheduler/client.c
index 4fb8318..e6720c2 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -376,6 +376,14 @@
         if (pid == -1) fatal_perror( "fork" );
         if (!pid)
         {
+            /* if server is explicitly specified, use this */
+            if ((p = getenv("WINESERVER")))
+            {
+                execl( p, "wineserver", NULL );
+                fatal_perror( "could not exec the server '%s'\n"
+                              "    specified in the WINESERVER environment variable", p );
+            }
+
             /* first try the installation dir */
             execl( BINDIR "/wineserver", "wineserver", NULL );