diff --git a/Makefile b/Makefile
index b88f3c0..c5ed735 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ SUB =   lib tftp tftpd
 %.clean:
 	$(MAKE) -C $(patsubst %.clean, %, $@) clean
 
-%.spotless:
-	$(MAKE) -C $(patsubst %.spotless, %, $@) spotless
+%.distclean:
+	$(MAKE) -C $(patsubst %.distclean, %, $@) distclean
 
 all:      MCONFIG $(patsubst %, %.build, $(SUB))
 
@@ -21,10 +21,13 @@ install:  MCONFIG $(patsubst %, %.install, $(SUB))
 
 clean:    $(patsubst %, %.clean, $(SUB))
 
-spotless: $(patsubst %, %.spotless, $(SUB))
+distclean: $(patsubst %, %.distclean, $(SUB))
 	rm -f MCONFIG config.cache config.log config.h *~ \#*
 	find . -type f \( -name \*.orig -o -name \*.rej \) | xargs -r rm -f
 
+spotless: distclean
+	rm -f configure
+
 config:	MCONFIG
 
 MCONFIG: configure MCONFIG.in config.h.in
diff --git a/lib/Makefile b/lib/Makefile
index fb56fa7..e1de2ef 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -12,7 +12,7 @@ install:
 clean:
 	-rm -f *.a *.o
 
-spotless: clean
+distclean: clean
 	-rm -f *~
 
 libxtra.a: $(LIBOBJS)
diff --git a/tftp/Makefile b/tftp/Makefile
index e7e94c8..1aea498 100644
--- a/tftp/Makefile
+++ b/tftp/Makefile
@@ -17,5 +17,5 @@ install: tftp
 clean:
 	rm -f *.o tftp
 
-spotless: clean
+distclean: clean
 	rm -f *~
diff --git a/tftpd/Makefile b/tftpd/Makefile
index 04aeaf4..be2720e 100644
--- a/tftpd/Makefile
+++ b/tftpd/Makefile
@@ -23,5 +23,5 @@ install: tftpd
 clean:
 	rm -f *.o tftpd tftpsubs.c tftpsubs.h
 
-spotless: clean
+distclean: clean
 	rm -f *~