diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index e569a69da..25219f53e 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-20  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygserver-config: Remove misleading text describing the
+	"CYGWIN=server" setting for the client.
+
 2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
 
 	* Makefile.in: Add DESTDIR functionality.
diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
index 54440c3e9..f9515e71e 100755
--- a/winsup/cygserver/cygserver-config
+++ b/winsup/cygserver/cygserver-config
@@ -198,12 +198,5 @@ echo "Further configuration options are available by editing the configuration"
 echo "file ${SYSCONFDIR}/cygserver.conf.  Please read the inline information in that"
 echo "file carefully. The best option for the start is to just leave it alone."
 echo
-echo "Please keep in mind, that a client application which wants to use"
-echo "the services provided by cygserver *must* have the environment variable"
-echo "CYGWIN set so that it contains the word \"server\".  So, if you don't"
-echo "need any other special CYGWIN setting, just set it to \"server\"".
-echo
-echo "It is advisable to add this setting to the Windows system environment."
-echo
 echo "Basic Cygserver configuration finished. Have fun!"
 echo