diff --git a/ChangeLog b/ChangeLog
index ed9f753972e30be54dd14386d560acee437abb8e..ddd9502a4dd86905afac737064ec6947cf54b100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul  5 09:47:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/libvirt.c, src/xen_unified.c: Move code converting NULL
+	and 'xen' into 'xen://' from the Xen driver into the main libvirt.c
+	entry point. We need this conversion done at the top level, so that
+	the network driver open func gets a valid URI in Xen case
+
 Thu Jul  5 09:46:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/remote_internal.c: Fixed typo in setting flags for network
diff --git a/src/libvirt.c b/src/libvirt.c
index 876d4cd08cd84089e8e162e6103ddea0cc8ffb16..0ffbf0ad958f9dda0c11146dc7ae898a7f635381 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -372,6 +372,14 @@ do_open (const char *name, int flags)
     int i, res;
     virConnectPtr ret = NULL;
 
+    /* Convert NULL or "" to xen:/// for back compat */
+    if (!name || name[0] == '\0')
+        name = "xen:///";
+
+    /* Convert xen -> xen:/// for back compat */
+    if (!strcasecmp(name, "xen"))
+        name = "xen:///";
+
     if (!initialized)
         if (virInitialize() < 0)
 	    return NULL;
diff --git a/src/xen_unified.c b/src/xen_unified.c
index ba1e7606fe025b947386756f359e019ee9ec9df7..1f3628dcad1b680603dccd6bb727d7620d9290fc 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -90,14 +90,6 @@ xenUnifiedOpen (virConnectPtr conn, const char *name, int flags)
     xenUnifiedPrivatePtr priv;
     xmlURIPtr uri;
 
-    /* Convert NULL or "" to xen:/// for back compat */
-    if (!name || name[0] == '\0')
-        name = "xen:///";
-
-    /* Convert xen -> xen:/// for back compat */
-    if (!strcasecmp(name, "xen"))
-        name = "xen:///";
-
     uri = xmlParseURI(name);
     if (uri == NULL) {
         return VIR_DRV_OPEN_DECLINED;