diff --git a/ChangeLog b/ChangeLog
index 844ff95ea7..d58e41f026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 29 13:14:20 EDT 2006 Daniel Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Add handling of HTTP 500 error code
+	which can be returned by XenD do indicate failure error when
+	performing the requested operation (Identified by Pete Vetere).
+	
 Tue Aug 29 15:41:46 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
 	* python/libvir.c: Pete Vetere pointed out a bug in string cast 
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 48a5c5bde3..71a509eb00 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -521,6 +521,9 @@ http2unix(int ret)
         case 404:
             errno = ESRCH;
             break;
+        case 500:
+            errno = EIO;
+            break;
         default:
             virXendErrorInt(NULL, VIR_ERR_HTTP_ERROR, ret);
             errno = EINVAL;