+- dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
++ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde", NULL);
+ l = gul_find_file (dir, "bookmarks.xbel", 5);
+ ret = g_slist_concat (ret, l);
+ l = gul_find_file (dir, "bookmarks.xml", 5);
+ ret = g_slist_concat (ret, l);
+ g_free (dir);
+
+- dir = g_build_filename (g_get_home_dir (), ".kde2", NULL);
++ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde2", NULL);
+ l = gul_find_file (dir, "bookmarks.xbel", 5);
+ ret = g_slist_concat (ret, l);
+ l = gul_find_file (dir, "bookmarks.xml", 5);
+ ret = g_slist_concat (ret, l);
+ g_free (dir);
+
+- dir = g_build_filename (g_get_home_dir (), ".kde3", NULL);
++ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde3", NULL);
+ l = gul_find_file (dir, "bookmarks.xbel", 5);
+ ret = g_slist_concat (ret, l);
+ l = gul_find_file (dir, "bookmarks.xml", 5);
+ ret = g_slist_concat (ret, l);
+ g_free (dir);
+
+- dir = g_build_filename (g_get_home_dir (), ".konqueror", NULL);
++ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".konqueror", NULL);
+ l = gul_find_file (dir, "bookmarks.xbel", 5);
+ ret = g_slist_concat (ret, l);
+ l = gul_find_file (dir, "bookmarks.xml", 5);
+@@ -142,7 +142,7 @@
+ {
+ /* give a default */
+ ret = g_slist_prepend
+- (ret, g_build_filename (g_get_home_dir (),
++ (ret, g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (),
+ ".kde/share/apps/konqueror/bookmarks.xml", NULL));
+ }
+
+diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c
+--- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c 2004-06-20 00:33:52.000000000 +0200
++++ galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c 2004-08-10 15:03:54.309896144 +0200
+@@ -111,7 +111,7 @@
+ gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid)
+ {
+ GSList *l;
+- gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
++ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL);
+ l = gul_find_file (dir, "bookmarks.html", 4);
+ if (l == NULL)
+ {
+diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c
+--- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c 2004-06-20 00:33:52.000000000 +0200
++++ galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c 2004-08-10 15:04:10.676408056 +0200
+@@ -109,7 +109,7 @@
+ gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid)
+ {
+ GSList *l;
+- gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
++ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL);
+ l = gul_find_file (dir, "bookmarks.html", 4);
+ if (l == NULL)
+ {
+diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c
+--- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c 2004-06-20 00:33:52.000000000 +0200
++++ galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c 2004-08-10 15:03:37.885393048 +0200
+@@ -119,7 +119,7 @@
+ GSList *l;
+ gchar *dir;
+
+- dir = g_build_filename (g_get_home_dir (),
++ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
+ GNOME_DOT_GNOME,
+ "epiphany",
+ NULL);
+diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c
+--- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c 2004-06-20 00:33:52.000000000 +0200
++++ galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c 2004-08-10 15:04:20.988840328 +0200
+@@ -121,7 +121,7 @@