diff --git a/ChangeLog b/ChangeLog
index 333d9b6e30..c1d9eb28e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2001-03-04  Dave Peticolas  <dave@krondo.com>
 
+	* configure.in: define a new substitution GNC_PIXMAP_DIR for
+	a pixmap directory.
+
+	* src/pixmaps/Makefile.am (gncpixmapdir): install in configured
+	pixmap directory
+
+	* src/gnc-dir.h.in (GNC_PIXMAP_DIR): define pixmap directory
+
+	* src/Makefile.am (gnc-dir.h): configure pixmap directory
+	for gnc-dir.h.in
+
+	* src/gnome/dialog-utils.c (gnc_get_pixmap): use configured
+	pixmap directory
+
+	* src/engine/gnc-associate-account.c: fix some uses of glib
+	list routines (they always return the new head of the list).
+
 	* src/pixmaps: add gnucash_long.png graphic
 
 	* src/gnome/top-level.c (gnucash_ui_init): show splash screen
diff --git a/configure.in b/configure.in
index d6bcc1ef03..ec86d521ae 100644
--- a/configure.in
+++ b/configure.in
@@ -115,6 +115,7 @@ else
 fi
 
 GNC_ACCOUNTS_DIR=${GNC_SHAREDIR}/accounts
+GNC_PIXMAP_DIR='${datadir}/pixmaps/gnucash'
 
 AC_SUBST(GNC_CONFIGDIR)
 AC_SUBST(GNC_LIBDIR)
@@ -122,6 +123,7 @@ AC_SUBST(GNC_SHAREDIR)
 AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_DOC_INSTALL_DIR)
 AC_SUBST(GNC_ACCOUNTS_DIR)
+AC_SUBST(GNC_PIXMAP_DIR)
 
 # We should always see these errors...
 CFLAGS="${CFLAGS} -Wall"
diff --git a/src/Makefile.am b/src/Makefile.am
index b7b3feb9a0..7da411965e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,7 @@ INCLUDES = \
 gnc-dir.h: gnc-dir.h.in
 	rm -f $@.tmp
 	sed < $@.in > $@.tmp \
-	    -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:g'
+	    -e 's:@-GNC_PIXMAP_DIR-@:${GNC_PIXMAP_DIR}:g'
 	mv $@.tmp $@
 BUILT_SOURCES += gnc-dir.h
 
diff --git a/src/gnc-dir.h.in b/src/gnc-dir.h.in
index ab52769e73..2e3970b369 100644
--- a/src/gnc-dir.h.in
+++ b/src/gnc-dir.h.in
@@ -23,6 +23,6 @@
 #ifndef __GNC_DIR_H__
 #define __GNC_DIR_H__
 
-#define GNC_SHAREDIR "@-GNC_SHAREDIR-@"
+#define GNC_PIXMAP_DIR "@-GNC_PIXMAP_DIR-@"
 
 #endif
diff --git a/src/gnome/dialog-utils.c b/src/gnome/dialog-utils.c
index 47e57ca96e..a5b65560b3 100644
--- a/src/gnome/dialog-utils.c
+++ b/src/gnome/dialog-utils.c
@@ -188,7 +188,7 @@ gnc_get_pixmap (const char *name)
 
   g_return_val_if_fail (name != NULL, NULL);
 
-  fullname = g_strconcat (GNC_SHAREDIR, "/", name, NULL);
+  fullname = g_strconcat (GNC_PIXMAP_DIR, "/", name, NULL);
   pixmap = gnome_pixmap_new_from_file (fullname);
   g_free (fullname);
 
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 5be0bf30c3..1507a2e864 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -1,4 +1,4 @@
-gncpixmapdir = ${GNC_SHAREDIR}
+gncpixmapdir = ${GNC_PIXMAP_DIR}
 
 gncpixmap_DATA = \
   gnucash_long.png