diff --git a/ChangeLog b/ChangeLog
index 62dd4f342..dcf085777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-18  Adam Fedor  <fedor@gnu.org>
+
+	* Tools/gdomap.c (xgethostname): Add missing colon (patch
+	from Tom Koelman).
+
+	* Tools/Makefile.postamble: Fix missing space.
+	* Souce/Makefile.postamble (before-uninstall): Change from 
+	after-uninstall.
+
 2004-06-18  Manuel Guesdon <mguesdon@orange-concept.com>
 
 	* Source/NSKeyValueCoding.m: fix exception userInfo
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index d01baf498..764368fed 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -80,7 +80,7 @@ after-install::
 # before-uninstall::
 
 # Things to do after uninstalling
-after-uninstall::
+before-uninstall::
 	for file in $(GNU_HEADERS); do \
 	  rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
 	done
diff --git a/Tools/Makefile.postamble b/Tools/Makefile.postamble
index cef383190..9904288ab 100644
--- a/Tools/Makefile.postamble
+++ b/Tools/Makefile.postamble
@@ -82,7 +82,7 @@ before-uninstall::
 	for file in $(MAN1_PAGES); do \
 	  rm -f $(GNUSTEP_DOCUMENTATION_MAN)/man1/$$file.gz; \
 	done;
-	-rmdir$(GNUSTEP_DOCUMENTATION_MAN)/man1;
+	-rmdir $(GNUSTEP_DOCUMENTATION_MAN)/man1;
 	for file in $(MAN8_PAGES); do \
 	  rm -f $(GNUSTEP_DOCUMENTATION_MAN)/man8/$$file.gz; \
 	done;
diff --git a/Tools/gdomap.c b/Tools/gdomap.c
index b458fffad..e880d9c7f 100644
--- a/Tools/gdomap.c
+++ b/Tools/gdomap.c
@@ -4803,7 +4803,7 @@ xgethostname (void)
   addnull = 1;
 #endif /* _SC_HOST_NAME_MAX */
 #ifdef INTERNET_MAX_HOST_NAME_LENGTH
-  size = INTERNET_MAX_HOST_NAME_LENGTH
+  size = INTERNET_MAX_HOST_NAME_LENGTH;
   addnull = 1;
 #endif
   if (size <= 0)