--- a/components/Makefile	Mon Mar 16 09:18:04 2015 -0700
+++ b/components/Makefile	Mon Mar 16 09:20:05 2015 -0700
@@ -112,7 +112,8 @@
 
 clobber:	$(COMPONENT_DIRS.nosetup) clean
 	@cd ../tools ; echo "clobbering tools..." ; $(GMAKE) clobber
-	$(RM) -r $(WS_REPO) $(WS_LOGS) $(WS_LINT_CACHE)
+	$(RM) -r $(WS_REPO) $(WS_LOGS) $(WS_LINT_CACHE) \
+	    $(shell find . -name 'manifest-*.published')
 
 
 setup:	$(WS_MACH) $(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE)

--- a/doc/makefile-targets.txt	Mon Mar 16 09:18:04 2015 -0700
+++ b/doc/makefile-targets.txt	Mon Mar 16 09:20:05 2015 -0700
@@ -93,7 +93,10 @@
   to act across all components, or on an individual component basis.  It is
   often automatically defined by including one of the $(WS_MAKE_RULES)
   Makefile fragments.  It depends on the previously described 'clean' target
-  and additionally cleans up any downloaded source archives.
+  and additionally cleans up any downloaded source archives.  In addition,
+  when done from the top level or component sub-directory, it will do a find
+  of 'manifest-*.published' and clean those up; these can be left over from
+  components that were published but then 'hg rm'd before the next clobber.
 
 REQUIRED_PACKAGES::
   This target is present in all component Makefiles.  It is automatically