diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 40104f097..58a773e93 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20  Christopher Faylor  <cgf@redhat.com>
+
+	* configure.in: Make --use-server the default.
+	* configure: Regenerate.
+
 2003-08-05  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.common: Hmm.  Older compilers seem to need -nostdinc.
diff --git a/winsup/configure b/winsup/configure
index 1b4587109..5dee7e399 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -918,17 +918,13 @@ fi
 CXXFLAGS='$(CFLAGS)'
 
 
-use_cygserver=''
+use_cygserver='yes'
 # Check whether --enable-server or --disable-server was given.
 if test "${enable_server+set}" = set; then
   enableval="$enable_server"
   case "${enableval}" in
-yes)	 cat >> confdefs.h <<\EOF
-#define USE_CYGSERVE 1
-EOF
-
-	 use_cygserver=1 ;;
-no)	 ;;
+yes)	;;
+no)	use_cygserver=;;
 esac
 
 fi
@@ -951,7 +947,7 @@ subdirs="$SUBDIRS"
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:955: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:951: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/winsup/configure.in b/winsup/configure.in
index 36a3bcfdc..18766ba8c 100755
--- a/winsup/configure.in
+++ b/winsup/configure.in
@@ -66,13 +66,12 @@ AC_CANONICAL_SYSTEM
 LIB_AC_PROG_CC
 LIB_AC_PROG_CXX
 
-use_cygserver=''
+use_cygserver='yes'
 AC_ARG_ENABLE(server,
 [ --enable-server		Build a cygwin DLL which can communicate with cygserver],
 [case "${enableval}" in
-yes)	 AC_DEFINE(USE_CYGSERVE)
-	 use_cygserver=1 ;;
-no)	 ;;
+yes)	;;
+no)	use_cygserver=;;
 esac
 ])