--- a/.xserverrc	Sun Dec 04 18:45:24 2011 +0200
+++ b/.xserverrc	Mon Dec 05 22:29:20 2011 +0200
@@ -1,7 +1,10 @@
 #!/bin/sh
 
-if [ -n "$COMPSPEC" ]; then
-  XWin -multiwindow -clipboard -silent-dup-error -xkblayout "us,ru" -xkboptions "grp:caps_toggle"
+# http://tldp.org/HOWTO/XWindow-User-HOWTO/runningx.html
+
+if [ -n "$WINDIR" -o "$TERM" = cygwin ]; then
+  # Probably under Cygwin.
+  exec XWin -multiwindow -clipboard -silent-dup-error -xkblayout "us,ru" -xkboptions "grp:caps_toggle"
 else
-  X
+  exec X
 fi