diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 5a87a67b6..3ada9bf25 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-25  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in (CXXFLAGS): Remove duplicate options handled in
+	Makefile.common.
+
 2003-11-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* msg.cc (client_request_msg::serve): Add default case to msgop switch.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index d76b47155..fa6960b73 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -33,7 +33,7 @@ include $(srcdir)/../Makefile.common
 
 CFLAGS:=@CFLAGS@ -I$(cygwin_source)
 CXXFLAGS:=@CXXFLAGS@ -I$(cygwin_source)
-override CXXFLAGS+=-MMD -fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
+override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
 
 .SUFFIXES: .c .cc .a .o .d