diff --git a/ChangeLog b/ChangeLog
index ef7a760126..f3a4c6343d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-08  Sven Neumann  <sven@gimp.org>
+
+	Applied parts of a patch from Daniel Richard G. (bug #445374):
+
+	* themes/Default/images/Makefile.am
+	* data/tips/Makefile.am
+	* menus/Makefile.am: more srcdir/builddir tweaks.
+	
 2007-06-08  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimpviewable.h: #define GIMP_VIEWABLE_PRIORITY_IDLE,
diff --git a/data/tips/Makefile.am b/data/tips/Makefile.am
index edf1542a67..71f21d0238 100644
--- a/data/tips/Makefile.am
+++ b/data/tips/Makefile.am
@@ -23,8 +23,7 @@ gimp-tips.xml: gimp-tips.xml.in $(wildcard $(top_srcdir)/po-tips/*.po)
 
 validate: gimp-tips.xml
 if HAVE_XMLLINT
-	@cd $(srcdir); \
-	$(XMLLINT) --noout --valid gimp-tips.xml || \
+	@$(XMLLINT) --noout --path $(srcdir) --valid $< || \
 	  ( echo "* gimp-tips.xml INVALID *"; exit 1; )
 endif
 
diff --git a/menus/Makefile.am b/menus/Makefile.am
index d34301f8c2..4c5a307960 100644
--- a/menus/Makefile.am
+++ b/menus/Makefile.am
@@ -62,9 +62,8 @@ endif
 
 validate: $(menudata_DATA)
 if HAVE_XMLLINT
-	@cd $(srcdir); \
-	for menu in $(menudata_DATA); do \
-	   $(XMLLINT) --noout --valid $$menu || \
+	@for menu in $^; do \
+	   $(XMLLINT) --noout --path $(srcdir) --valid $$menu || \
 	   ( echo "*** $$menu INVALID ***"; exit 1; ) ; \
 	done
 endif
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index 1297d967ac..269ec7fca7 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -372,8 +372,8 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
 	    echo "  $(srcdir)/$$image" >> $@; \
 	  done )
 
-$(srcdir)/gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
+gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(CORE_VARIABLES) > $(@F)
 
-$(srcdir)/gimp-stock-pixbufs.h: stock-icons.list
-	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F)
+gimp-stock-pixbufs.h: stock-icons.list
+	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat $<` > $(@F)