diff --git a/ChangeLog b/ChangeLog
index 6572c8c..5549a60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-17  Glynn Foster  <glynn.foster@sun.com>
+
+	* src/tree.c: Patch from Ed Catmur to fix the list dialog
+	on stdin. Fixes #164152.
+	* src/about.c, THANKS: Update.
+
 2005-01-11  Glynn Foster  <glynn.foster@sun.com>
 
 	* configure.in: post release bump.
diff --git a/THANKS b/THANKS
index 637ebc4..584075e 100644
--- a/THANKS
+++ b/THANKS
@@ -13,6 +13,7 @@
   "Ross Burton  <ross burtonini com>",
   "Damien Carbery  <damien carbery sun com>",
   "Anders Carlsson  <andersca codefactory se>",
+  "Ed Catmur  <ed catmur co uk>",
   "Nicholas Curran  <quasar austar net au>",
   "John Fleck  <jfleck inkstain net>",
   "Sebastian Heinlein <glatzor pimpzkru de>",
diff --git a/src/about.c b/src/about.c
index d6fc908..d64d677 100644
--- a/src/about.c
+++ b/src/about.c
@@ -61,6 +61,7 @@ static const gchar *author_credits[] = {
   "Ross Burton  <ross burtonini com>",
   "Damien Carbery  <damien carbery sun com>",
   "Anders Carlsson  <andersca codefactory se>",
+  "Ed Catmur  <ed catmur co uk>",
   "Nicholas Curran  <quasar austar net au>",
   "John Fleck  <jfleck inkstain net>",
   "Sebastian Heinlein <glatzor pimpzkru de>",
diff --git a/src/tree.c b/src/tree.c
index 49c1d78..63fe4ae 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -440,13 +440,13 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE);
 
   if (tree_data->radiobox || tree_data->checkbox) {
-    if (tree_data->data)
+    if (tree_data->data && *tree_data->data)
       zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view), tree_data->data, n_columns, TRUE, tree_data->editable);
     else
       zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, TRUE, tree_data->editable);
   }
   else {
-    if (tree_data->data)
+    if (tree_data->data && *tree_data->data)
       zenity_tree_fill_entries (GTK_TREE_VIEW (tree_view), tree_data->data, n_columns, FALSE, tree_data->editable);
     else
       zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, FALSE, tree_data->editable);