diff --git a/ChangeLog b/ChangeLog
index 428dec50f..0f9fe83ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-08  Robert Millan  <rmh@aybabtu.com>
+
+	* Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and
+	`$(update-grub_DATA)'.
+	(distcheck): Fix race condition when invoking `$(MAKE)' on multiple
+	targets.
+
 2008-01-07  Robert Millan  <rmh@aybabtu.com>
 
 	* boot/i386/pc/boot.S (boot_drive_check): Add a comment indicating
diff --git a/Makefile.in b/Makefile.in
index c6a04c91e..84b4e9c7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,6 +219,10 @@ uninstall:
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  rm -f $(DESTDIR)$(sbindir)/$$dest; \
 	done
+	@list='$(update-grub_SCRIPTS) $(update-grub_DATA)'; for file in $$list; do \
+	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+	  rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
+	done
 
 clean:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -271,11 +275,11 @@ distcheck: dist
 	dc_instdir=`CDPATH=: && cd $(distdir)/=inst && pwd` \
 	  && cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_instdir \
-	  && $(MAKE) all dvi check install uninstall \
+	  && $(MAKE) all dvi check install && $(MAKE) uninstall \
 	  && (test `find $$dc_instdir -type f -print | wc -l` -le 1 \
 	     || (echo "Error: files left after uninstall" 1>&2; \
 	         exit 1)) \
-	  && $(MAKE) dist distclean \
+	  && $(MAKE) dist && $(MAKE) distclean \
 	  && rm -f $(distdir).tar.gz \
 	  && (test `find . -type f -print | wc -l` -eq 0 \
 	     || (echo "Error: files left after distclean" 1>&2; \