diff --git a/xen-xenstore-cli.patch b/xen-xenstore-cli.patch
index 06077d5..9a8582c 100644
--- a/xen-xenstore-cli.patch
+++ b/xen-xenstore-cli.patch
@@ -1,7 +1,7 @@
-diff -r c6776b6da8ee tools/xenstore/xenstore_client.c
---- a/tools/xenstore/xenstore_client.c	Wed Nov 14 23:35:43 2007 +0000
-+++ b/tools/xenstore/xenstore_client.c	Fri Feb 01 22:17:48 2008 +0100
-@@ -350,7 +350,9 @@ main(int argc, char **argv)
+diff -rup xen-3.2.0.orig/tools/xenstore/xenstore_client.c xen-3.2.0.new/tools/xenstore/xenstore_client.c
+--- xen-3.2.0.orig/tools/xenstore/xenstore_client.c	2008-02-06 13:18:04.000000000 -0500
++++ xen-3.2.0.new/tools/xenstore/xenstore_client.c	2008-02-06 13:17:43.000000000 -0500
+@@ -357,7 +357,9 @@ main(int argc, char **argv)
  
      xsh = socket ? xs_daemon_open() : xs_domain_open();
      if (xsh == NULL)
@@ -12,3 +12,17 @@ diff -r c6776b6da8ee tools/xenstore/xenstore_client.c
  
    again:
      if (transaction) {
+diff -rup xen-3.2.0.orig/tools/xenstore/xsls.c xen-3.2.0.new/tools/xenstore/xsls.c
+--- xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 13:34:59.000000000 -0500
++++ xen-3.2.0.new/tools/xenstore/xsls.c	2008-02-06 13:19:09.000000000 -0500
+@@ -163,7 +163,9 @@ int main(int argc, char *argv[])
+ 
+     xsh = socket ? xs_daemon_open() : xs_domain_open();
+     if (xsh == NULL)
+-        err(1, socket ? "xs_daemon_open" : "xs_domain_open");
++       xsh = socket ? xs_domain_open() : xs_daemon_open();
++    if (xsh == NULL)
++       err(1, "xs_*_open");
+ 
+     print_dir(xsh, (argc - optind) == 1 ? argv[optind] : "/", 0, show_perm);
+ 
diff --git a/xen.spec b/xen.spec
index d80a2cc..879df99 100644
--- a/xen.spec
+++ b/xen.spec
@@ -2,7 +2,7 @@
 
 # Always set these 3 tags
 %define base_version 3.2.0
-%define base_release 5
+%define base_release 6
 
 # Hypervisor ABI
 %define hv_abi  3.2
@@ -448,6 +448,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Wed Feb  6 2008 Daniel P. Berrange <berrange@redhat.com> - 3.2.0-6.fc9
+- Fixed xenstore-ls to automatically use xenstored socket as needed
+
 * Sun Feb  3 2008 Daniel P. Berrange <berrange@redhat.com> - 3.2.0-5.fc9
 - Fix timer mode parameter handling for HVM
 - Temporarily disable all Latex docs due to texlive problems (rhbz #431327)