diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f9300177c..283bc7ff6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-11  Christopher Faylor  <cgf@timesys.com>
+
+	* Makefile.in: Avoid initial heap allocation since cygwin has its own
+	heap.
+
 2005-06-11  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_console.cc (fhandler_console::read): Fix a compiler warning.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 27c8775f1..087289b1c 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -367,7 +367,8 @@ maintainer-clean realclean: clean
 
 # Rule to build cygwin.dll
 $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
-	$(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
+	$(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) \
+	-Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \
 	-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
 	$(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \
 	-lgcc $(DLL_IMPORTS)