diff -urNp setup-2.5.58-orig/csh.login setup-2.5.58/csh.login
--- setup-2.5.58-orig/csh.login	2011-12-05 18:21:56.911334417 +0100
+++ setup-2.5.58/csh.login	2011-12-05 18:26:58.661451837 +0100
@@ -3,14 +3,12 @@
 # System wide environment and startup programs, for login setup
 
 if ($?PATH) then
-	if ( "${path}" !~ */usr/X11R6/bin* ) then
-		setenv PATH "${PATH}:/usr/X11R6/bin"
-        endif
+  #do not override user specified PATH
 else
 	if ( $uid == 0 ) then
-		setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
+		setenv PATH "/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
 	else
-		setenv PATH "/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
+		setenv PATH "/bin:/usr/bin:/usr/local/bin"
 	endif
 endif
 
Binary files setup-2.5.58-orig/.csh.login.swp and setup-2.5.58/.csh.login.swp differ