diff --git a/ChangeLog b/ChangeLog
index 6e6a1f4fae..377d4caebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+Tue Jun 18 17:56:44 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* rpm/Makefile (clean): New target.
+
+	* stdlib/test-canon.c: New test program contributed by David Mosberger.
+	* stdlib/Makefile (tests): Add test-canon.
+	* stdlib/canonicalize.c: Rewritten by David Mosberger.
+
 Mon Jun 17 17:53:21 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* mach/Machrules (%_server.c %_server.h rule): Remove gratuitous
+	mention of $< in mig cmd.  Thanks to Shantanu Goel.
+
 	* sysdeps/mach/hurd/brk.c (___brk_addr): Define as weak alias for
 	_hurd_brk.
 
diff --git a/rpm/Makefile b/rpm/Makefile
index 1bf6b6ed51..242c412bd5 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -90,3 +90,7 @@ glibc-$(version).$(config).rpm: $(config) rpmrc $(instfiles)
 
 # Avoid time-consuming implicit rule search.
 $(instfiles) : ;
+
+.PHONY: clean
+clean:
+	rm -f $(config) glibc-$(version).$(config).rpm