diff --git a/ChangeLog b/ChangeLog
index e3e8e98c76..c29fb4aada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* docs/tools/Makefile.am:
+	* gtk/Makefile.am: Make make clean clean.  (#410160, Tommi
+	Komulainen)
+
 2007-04-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/win32/bdfcursor.c (compose_cursors_from_fonts):
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 97ec058f22..a38b96ab40 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -32,4 +32,9 @@ doc_shooter_SOURCES=	\
 	widgets.h
 
 clean-local:
-	rm -f *.png
+	for file in gnome-foot.png *.png; do \
+	  case "$$file" in \
+	    gnome-foot.png|gnome-gmush.png) ;; \
+	    *) rm -f $$file ;; \
+	  esac ; \
+	done
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e86e713d6b..74e8884c58 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -709,7 +709,7 @@ gtk_extra_sources =				\
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
 EXTRA_HEADERS =
 EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)