diff --git a/Makefile b/Makefile
index 9832d4c6acfcfc95ddeb20bdf5f97353eb768f9d..853bc3c6eee2998137ce1ebadeb973f533c6d9f4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,9 @@ clean:
 	done
 
 
-realclean: clean
-	#-rm -rf $(LIB_DIR)
+realclean:
+	touch $(TOP)/configs/current
+	make clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 
diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 85cde5b916ab07247ed119757c446f7a271d7bb9..ad0b47a2b9f1b8ade94b5328a38a0f8753cd717f 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -73,9 +73,6 @@ default: readtex.c readtex.h $(PROGS)
 
 
 clean:
-	-rm -f *.o *~
-
-realclean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
 	-rm -f readtex.[ch]
diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
index f42310818877dd7d010b4b2b199d4e07218f1796..5fbfde2ca47cba606eaeedd4c4042766daa49275 100644
--- a/progs/redbook/Makefile
+++ b/progs/redbook/Makefile
@@ -32,10 +32,8 @@ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \
 
 default: $(PROGS)
 
-clean:
-	-rm -f *.o *~
 
-realclean:
+clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
 
diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 464492de7329fcfeec0dbd8fb545f9e2c83b7739..cf651b25a9b3b8b910dd4f741b9c8fad619e0b55 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -26,9 +26,7 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
 
 default: $(PROGS)
 
-clean:
-	-rm -f *.o *~
 
-realclean:
+clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 0904ee3445a1900fe6f037a701208fa16ec6e702..6462c8ee206efd7586c681bdfbe9e33caf80e225 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-LIBS = -L$(LIB_DIR) $(APP_LIB_DEPS)
+LIBS = $(APP_LIB_DEPS)
 
 LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB)
 
@@ -44,9 +44,6 @@ default: $(PROGS)
 
 
 clean:
-	-rm -f *.o *~
-
-realclean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index d5ec4d9f25dfca9a738b8ee150ca503953fa54fd..0950e76fd990a6a5b9a607a75eacfd58f28ff6e6 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -27,8 +27,10 @@ default: $(LIB_DIR)/$(GLW_LIB_NAME)
 
 
 clean:
+	-rm depend
 	-rm -f *.o *~
 
+
 # Make the library
 $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 	$(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index e61499609edeb135ac7fed9c1edd51249add2660..a90ac8275acba334e97cde111b5ba49269a38c50 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -165,6 +165,7 @@ tags:
 
 clean:
 	-rm -f */*.o
+	rm -f depend
 	for dir in $(SUBDIRS) ; do \
 		pushd $$dir ; \
 		make clean ; \