diff --git a/ChangeLog b/ChangeLog
index 36b4c868ce..e2578a205d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 15 11:33:33 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/lxc_driver.c: adds the getHostname method to the lxc driver
+	  patch by Dan Smith
+
 Tue Apr 14 10:46:44 PDT 2009 Dan Smith <danms@us.ibm.com>
 
 	* src/veth.c: Fix veth off-by-one error
@@ -8,7 +13,8 @@ Tue Apr 14 10:46:44 PDT 2009 Dan Smith <danms@us.ibm.com>
 
 Tue Apr 14 14:46:29 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
-	* libvirt.spec.in: fix build on RHEL and Centos 5.x
+	* libvirt.spec.in: fix build on RHEL and Centos 5.x, patch
+	  by Joseph Shraibman, fixes #495610
 
 Tue Apr  7 14:48:35 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 9cfe7e02b7..5392af1bff 100644
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1404,6 +1404,20 @@ cleanup:
     return ret;
 }
 
+static char *lxcGetHostname (virConnectPtr conn)
+{
+    char *result;
+
+    result = virGetHostname();
+    if (result == NULL) {
+        virReportSystemError (conn, errno,
+                              "%s", _("failed to determine host name"));
+        return NULL;
+    }
+    /* Caller frees this string. */
+    return result;
+}
+
 /* Function Tables */
 static virDriver lxcDriver = {
     VIR_DRV_LXC, /* the number virDrvNo */
@@ -1413,7 +1427,7 @@ static virDriver lxcDriver = {
     NULL, /* supports_feature */
     NULL, /* type */
     lxcVersion, /* version */
-    NULL, /* getHostname */
+    lxcGetHostname, /* getHostname */
     NULL, /* getMaxVcpus */
     NULL, /* nodeGetInfo */
     NULL, /* getCapabilities */