diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d00c15284..8dd42966e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  4 20:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+	* Makefile.in: Change `-nostartfiles' to `-nostdlib' to avoid
+	automatic linking with default libraries when linking new-cygwin1.dll.
+	Link with libgcc.a and libstdc++.a explicitly.
+
 Sun Dec  3 01:20:25 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* path.cc (normalize_win32_path): Handle UNC paths better.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 6bfbf891f..37f4c9623 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -189,8 +189,8 @@ new-$(LIB_NAME): $(LIB_NAME)
 # Rule to build cygwin.dll
 
 new-$(DLL_NAME): $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) Makefile winver_stamp
-	$(CXX) $(CXXFLAGS) -nostartfiles -Wl,-shared -o $@ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o \
-	winver.o $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC)
+	$(CXX) $(CXXFLAGS) -nostdlib -Wl,-shared -o $@ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o \
+	winver.o $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC) -lgcc -lstdc++
 
 dll_ofiles: $(DLL_OFILES)