diff --git a/Admin/GNUmakefile b/Admin/GNUmakefile
index 100590266..0029a1cd4 100644
--- a/Admin/GNUmakefile
+++ b/Admin/GNUmakefile
@@ -34,7 +34,7 @@ example.patch \
 volunteers \
 tasks
 
-RCS_FILES = Makefile Makefile.postamble
+RCS_FILES = GNUmakefile Makefile.postamble
 DIST_FILES = $(RCS_FILES) $(ADMIN_FILES)
 
 -include Makefile.preamble
diff --git a/ChangeLog b/ChangeLog
index a144de5af..db6fb05fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Oct 31 17:00:29 1997  Adam Fedor  <fedor@doc.com>
+
+	* GNUmakefile (DIST_FILES): Update files.
+	* src/GNUmakefile: Likewise.
+	* checks/GNUmakefile: Likewise.
+	* examples/GNUmakefile: Likewise.
+	* doc/GNUmakefile: Likewise.
+	* admin/GNUmakefile: Likewise.
+	* NSCharacterSets/GNUmakefile: Likewise.
+	* NSTimeZones/GNUmakefile: Likewise.
+	* Tools/GNUmakefile: Likewise.
+	* Tools/Makefile.postamble (copy-dist): New target.
+	
 Fri Oct 31 15:16:46 1997  Adam Fedor  <fedor@doc.com>
 
 	* NSBundle.README: Removed obsolete file.
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 2091c41dd..52be3a600 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -58,7 +58,7 @@ HTML_FILES =
 DVI_FILES = gnustep-base.dvi objective-c.dvi
 
 TOP_DOC_FILES = README INSTALL NEWS
-RCS_FILES =  $(TEXI_FILES) Makefile Makefile.postamble
+RCS_FILES =  $(TEXI_FILES) GNUmakefile Makefile.postamble
 DIST_FILES = $(RCS_FILES) texinfo.tex $(TEXT_FILES)
 
 -include Makefile.preamble
diff --git a/Examples/GNUmakefile b/Examples/GNUmakefile
index 3f42190b0..b00b2c91b 100644
--- a/Examples/GNUmakefile
+++ b/Examples/GNUmakefile
@@ -49,16 +49,14 @@ first-client_OBJC_FILES = first-client.m
 second-server_OBJC_FILES = second-server.m
 second-client_OBJC_FILES = second-client.m
 
-SRCS = $(TOOL_NAME:=.m)
+SRCS = $(TEST_TOOL_NAME:=.m)
 
 HDRS = \
 first-server.h \
 second-server.h \
 second-client.h
 
-DIST_FILES = $(SRCS) $(HDRS) Makefile Makefile.postamble Makefile.preamble \
-Makefile.example.in \
-configure.example.in \
+DIST_FILES = $(SRCS) $(HDRS) GNUmakefile Makefile.postamble Makefile.preamble \
 custom-zone.m
 
 -include Makefile.preamble
diff --git a/GNUmakefile b/GNUmakefile
index 5838e80c1..2f69e050e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,7 +32,7 @@ include ./Version
 PACKAGE_NAME = gstep-base
 
 DIST_FILES = \
-	Makefile Makefile.postamble config.mak.in \
+	GNUmakefile Makefile.postamble config.mak.in \
 	configure.in aclocal.m4 acconfig.h \
 	configure.bat INSTALL.WIN32 \
 	config/config.nested.c config/config.nextcc.h config/config.nextrt.m \
diff --git a/NSCharacterSets/GNUmakefile b/NSCharacterSets/GNUmakefile
index 2cd780296..1a75e535e 100644
--- a/NSCharacterSets/GNUmakefile
+++ b/NSCharacterSets/GNUmakefile
@@ -42,7 +42,7 @@ uppercaseCharSet.dat \
 whitespaceCharSet.dat \
 whitespaceandnlCharSet.dat
 
-RCS_FILES = Makefile Makefile.postamble
+RCS_FILES = GNUmakefile Makefile.postamble
 DIST_FILES = $(RCS_FILES) $(CHARSET_FILES) README.CharSet
 INSTALL_FILES = $(CHARSET_FILES) README.CharSet
 
diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile
index 6cab17a20..ff8280ffc 100644
--- a/NSTimeZones/GNUmakefile
+++ b/NSTimeZones/GNUmakefile
@@ -33,7 +33,7 @@ resourcedir = $(GNUSTEP_RESOURCES)/gnustep
 TIMEZONE_ARCHIVE = \
 NSTimeZones.tar
 
-DIST_FILES = Makefile Makefile.postamble $(TIMEZONE_ARCHIVE)
+DIST_FILES = GNUmakefile Makefile.postamble $(TIMEZONE_ARCHIVE)
 
 -include Makefile.preamble
 
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 26cb69587..9aa24e363 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -455,7 +455,7 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
                   $(BASE_HEADERS)
 
 DIST_FILES = \
-        Makefile Makefile.preamble Makefile.postamble AUTHORS \
+        GNUmakefile Makefile.preamble Makefile.postamble AUTHORS \
         include/config.h.in include/preface.h.in \
 	include/config-win32.h \
         $(GNU_MFILES) \
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index fd37d450c..c49d05001 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -186,7 +186,7 @@ include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h
 TAGS: $(DIST_FILES)
 	etags $(DIST_FILES)
 
-AUTHORS: Makefile
+AUTHORS: GNUmakefile
 	rm -f AUTHORS
 	@echo Finding file authors...
 	@echo 'For the legal record, here is a list of who wrote what:'>AUTHORS
diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile
index f7ea69ac0..d7f62e950 100644
--- a/Testing/GNUmakefile
+++ b/Testing/GNUmakefile
@@ -152,7 +152,7 @@ MyCategory.h \
 SecondClass.h
 
 DIST_FILES = $(SRCS) $(HDRS) $(DYNAMIC_MFILES) $(DYNAMIC_HFILES) \
-	Makefile Makefile.preamble Makefile.postamble
+	GNUmakefile Makefile.preamble Makefile.postamble
 
 -include Makefile.preamble
 
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index 1151c4ba3..9198262e7 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -35,6 +35,13 @@ dread_OBJC_FILES = dread.m
 dremove_OBJC_FILES = dremove.m
 dwrite_OBJC_FILES = dwrite.m
 
+SOURCES = gdomap.c dread.m dremove.m dwrite.m
+
+HEADERS = gdomap.h
+
+DIST_FILES = GNUmakefile Makefile.preamble Makefile.postamble \
+$(SOURCES) $(HEADERS)
+
 -include Makefile.preamble
 
 include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/objc.make
diff --git a/Tools/Makefile.postamble b/Tools/Makefile.postamble
index d220c42cb..dc1915a5c 100644
--- a/Tools/Makefile.postamble
+++ b/Tools/Makefile.postamble
@@ -44,3 +44,10 @@ before-install::
 
 # Things to do after checking
 # after-check::
+
+copy-dist: $(DIST_FILES)
+	mkdir ../snap/Tools
+	for f in $(DIST_FILES); do \
+	  cp $$f ../snap/Tools ; \
+	done
+