diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index 84e83f009..f01223ed2 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -53,6 +53,10 @@ after-install::
 	  $(INSTALL_DATA) ./include/$$file \
 	    $(GNUSTEP_HEADERS)/gnustep/base/$$file ; \
 	done
+	if ! ( fgrep -q gdomap /etc/services ); then \
+	    echo "gdomap 538/tcp # GNUstep distrib objects" >> /etc/services; \
+	    echo "gdomap 538/udp # GNUstep distrib objects" >> /etc/services; \
+	fi
 
 # Things to do before uninstalling
 # before-uninstall::
@@ -188,13 +192,29 @@ include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h
 #
 #	Files that include mframe.h will need a rebuild if it is changed.
 #
-mframe.m NSConnection.m NSInvocation.m NSMethodSignature.m NSObjCRuntime.m : include/mframe.h
+mframe.m NSConnection.m NSInvocation.m NSMethodSignature.m NSObjCRuntime.m \
+	: include/mframe.h
 	touch $@
 
 #
-#	Files that include Fastmap.x will need a rebuild if it is changed.
+#	Files that include FastArray.x will need a rebuild if it is changed.
 #
-NSArchiver.m NSGCountedSet.m NSGDictionary.m NSGSet.m :	FastMap.x
+NSUnarchiver.m \
+	: FastArray.x
+	touch $@
+
+#
+#	Files that include FastMap.x will need a rebuild if it is changed.
+#
+NSArchiver.m NSGCountedSet.m NSGDictionary.m NSGSet.m \
+	: FastMap.x
+	touch $@
+
+#
+#	Files that include FastArray.x and FastMap.x
+#
+NSSerializer.m \
+	: FastArray.x FastMap.x
 	touch $@
 
 TAGS: $(DIST_FILES)