diff --git a/ChangeLog b/ChangeLog
index 40fec1d93da10a59b7914a31b825954fd7536b84..09151e4a490661b0651647d3d821e694c63dbffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-31	Benedikt Meurer <benny@xfce.org>
+
+	* configure.in.in: Depend on exo 0.3.1.3.
+	* thunar-vfs/thunar-vfs-listdir-job.c: Make sure the list head always
+	  points to a valid ThunarVfsInfo list, even if an error occurred while
+	  stat()'ing files in a given directory. Bug #1390.
+	* thunar/thunar-window.c(thunar_window_action_about): Use the newly
+	  added exo_url_about_dialog_hook() functions to open links in the
+	  about dialog.
+
 2006-01-31	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-standard-view.c(thunar_standard_view_scroll_event): Add
diff --git a/configure.in.in b/configure.in.in
index 28c94f3567292be0270f495dcd7bb4f3fa0d99cf..be70fe60c760cacaedc50cbfb3ce822060cc2080 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -156,7 +156,7 @@ XDT_I18N([ca de el es fr hu it ja nl pl pt_BR ru])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.2])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
diff --git a/thunar-vfs/thunar-vfs-listdir-job.c b/thunar-vfs/thunar-vfs-listdir-job.c
index 15390dd29bbf665a6ac2bc357781c646598d72bf..119ea85d416f8e3192392e09329a6ff2a0a04de4 100644
--- a/thunar-vfs/thunar-vfs-listdir-job.c
+++ b/thunar-vfs/thunar-vfs-listdir-job.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -203,6 +203,9 @@ thunar_vfs_listdir_job_execute (ThunarVfsJob *job)
 
               /* run the task */
               thunar_vfs_listdir_job_task (&task);
+
+              /* use the new first item as list head */
+              list = task.first;
             }
         }
       else
@@ -314,6 +317,8 @@ thunar_vfs_listdir_job_task (ThunarVfsListdirJobTask *task)
     {
       if (G_LIKELY (tp->prev != NULL))
         tp->prev->next = NULL;
+      else
+        task->first = NULL;
       g_list_free (tp);
     }
 }
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 52808eaea64101b7253d6194ae618a7eacb3a300..51b4b82ae385d2429501140d1824f9556c2a8153 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1488,8 +1488,8 @@ thunar_window_action_about (GtkAction    *action,
   logo = gdk_pixbuf_new_from_file (DATADIR "/pixmaps/Thunar/Thunar-about-logo.png", NULL);
 
   /* open the about dialog */
-  gtk_about_dialog_set_email_hook ((gpointer) exo_noop, NULL, NULL);
-  gtk_about_dialog_set_url_hook ((gpointer) exo_noop, NULL, NULL);
+  gtk_about_dialog_set_email_hook (exo_url_about_dialog_hook, NULL, NULL);
+  gtk_about_dialog_set_url_hook (exo_url_about_dialog_hook, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
                          "authors", authors,
                          "comments", _("Thunar is a fast and easy to use file manager\nfor the Xfce Desktop Environment."),