--- a/make-rules/prep-download.mk	Tue May 31 11:22:47 2016 -0700
+++ b/make-rules/prep-download.mk	Thu Jun 02 15:19:19 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 FETCH =		$(WS_TOOLS)/userland-fetch
@@ -45,7 +45,7 @@
 ifdef COMPONENT_ARCHIVE_URL$(1)
 
 ARCHIVES += $$(COMPONENT_ARCHIVE$(1))
-CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1))
+CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1)) $$(notdir $$(COMPONENT_SIG_URL$(1)))
 
 download::	$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1))
 

--- a/tools/Makefile	Tue May 31 11:22:47 2016 -0700
+++ b/tools/Makefile	Thu Jun 02 15:19:19 2016 -0700
@@ -71,4 +71,4 @@
 clobber:	clean
 	@$(RM) time-*.so python/pkglint/*.pyc
 	@$(RM) -r $(PARFAIT_TOOLS) $(MACH)
-
+	@$(RM) .gnupg/pubring.gpg~ .gnupg/secring.gpg .gnupg/trustdb.gpg