diff --git a/src/Make.ccmd b/src/Make.ccmd
index cb2b255123a13..88f647152c879 100644
--- a/src/Make.ccmd
+++ b/src/Make.ccmd
@@ -18,6 +18,9 @@ CLEANFILES+=y.tab.[ch]
 clean:
 	rm -f *.$(HOST_O) $(TARG) $(CLEANFILES)
 
+nuke: clean
+	rm -f "$(GOBIN)/$(TARG)"
+
 ifneq ($(NOINSTALL),1)
 install: $(QUOTED_GOBIN)/$(TARG)
 endif
diff --git a/src/Make.clib b/src/Make.clib
index ebe4f84b9618b..25fe88463cb4c 100644
--- a/src/Make.clib
+++ b/src/Make.clib
@@ -26,6 +26,8 @@ CLEANFILES+=y.tab.[ch] y.output a.out $(LIB)
 clean:
 	rm -f *.$(HOST_O) $(CLEANFILES)
 
+nuke: clean
+	rm -f "$(GOROOT)/lib/$(LIB)"
 
 y.tab.h: $(YFILES)
 	LANG=C LANGUAGE="en_US.UTF8" bison -v -y $(HOST_YFLAGS) $(YFILES)
diff --git a/src/Make.cmd b/src/Make.cmd
index 26c3ca2fc444a..27c6a2e134670 100644
--- a/src/Make.cmd
+++ b/src/Make.cmd
@@ -27,7 +27,7 @@ install: $(TARGDIR)/$(TARG)
 $(TARGDIR)/$(TARG): $(TARG)
 	mkdir -p $(TARGDIR) && cp -f $(TARG) $(TARGDIR)
 
-CLEANFILES+=$(TARG) _test _testmain.go
+CLEANFILES+=$(TARG) _test _testmain.go test.out build.out
 
 nuke: clean
 	rm -f $(TARGDIR)/$(TARG)