diff --git a/ChangeLog b/ChangeLog
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ae4cf58ceb..2ade4c3d50 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in gtk/stock-icons/Makefile.am: If not
+	building libpng, don't rebuild gtkstockpixbufs.h
+	(#81819, Bill Janssen)
+
 2002-05-15  jacob berkman  <jacob@ximian.com>
 
 	* demos/gtk-demo/Makefile.am (demos.h): just run perl on the
diff --git a/configure.in b/configure.in
index 74bc0313ff..2320b13b56 100644
--- a/configure.in
+++ b/configure.in
@@ -760,6 +760,12 @@ dnl Test for libmng
      fi
   fi
 
+  REBUILD_PNGS=\#
+  if test -z "$LIBPNG"; then
+     REBUILD_PNGS=
+  fi
+  AC_SUBST(REBUILD_PNGS)
+
 AC_SUBST(LIBTIFF)
 AC_SUBST(LIBJPEG)
 AC_SUBST(LIBPNG)
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 73ba213f49..f2807981c7 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -263,7 +263,7 @@ else
 pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
 endif
 
-gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
+gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
 	$(pixbuf_csource)							\
 	   --raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h ||	\
            ( rm -f $(srcdir)/gtkstockpixbufs.h && false )