diff --git a/ChangeLog b/ChangeLog
index 15f5092ee5..dce440a593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 22 18:00:39 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/remote_internal.c src/storage_driver.c: structure init fixes
+	  by Chris Lalancette
+
 Mon Sep 22 17:14:25 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/openvz_conf.c: patch from Evgeniy Sokolov to read
diff --git a/src/remote_internal.c b/src/remote_internal.c
index c554303dea..66de9d56aa 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -4907,14 +4907,14 @@ static virStorageDriver storage_driver = {
     .numOfDefinedPools = remoteNumOfDefinedStoragePools,
     .listDefinedPools = remoteListDefinedStoragePools,
     .findPoolSources = remoteFindStoragePoolSources,
-    .poolLookupByUUID = remoteStoragePoolLookupByUUID,
     .poolLookupByName = remoteStoragePoolLookupByName,
+    .poolLookupByUUID = remoteStoragePoolLookupByUUID,
     .poolLookupByVolume = remoteStoragePoolLookupByVolume,
     .poolCreateXML = remoteStoragePoolCreateXML,
     .poolDefineXML = remoteStoragePoolDefineXML,
+    .poolBuild = remoteStoragePoolBuild,
     .poolUndefine = remoteStoragePoolUndefine,
     .poolCreate = remoteStoragePoolCreate,
-    .poolBuild = remoteStoragePoolBuild,
     .poolDestroy = remoteStoragePoolDestroy,
     .poolDelete = remoteStoragePoolDelete,
     .poolRefresh = remoteStoragePoolRefresh,
diff --git a/src/storage_driver.c b/src/storage_driver.c
index ec0b37f69d..84b4bc6970 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -1229,39 +1229,40 @@ storageVolumeGetPath(virStorageVolPtr obj) {
 
 
 static virStorageDriver storageDriver = {
-    "storage",
-    storageOpen,
-    storageClose,
-    storageNumPools,
-    storageListPools,
-    storageNumDefinedPools,
-    storageListDefinedPools,
-    storageFindPoolSources,
-    storagePoolLookupByName,
-    storagePoolLookupByUUID,
-    storagePoolLookupByVolume,
-    storagePoolCreate,
-    storagePoolDefine,
-    storagePoolBuild,
-    storagePoolUndefine,
-    storagePoolStart,
-    storagePoolDestroy,
-    storagePoolDelete,
-    storagePoolRefresh,
-    storagePoolGetInfo,
-    storagePoolDumpXML,
-    storagePoolGetAutostart,
-    storagePoolSetAutostart,
-    storagePoolNumVolumes,
-    storagePoolListVolumes,
-    storageVolumeLookupByName,
-    storageVolumeLookupByKey,
-    storageVolumeLookupByPath,
-    storageVolumeCreateXML,
-    storageVolumeDelete,
-    storageVolumeGetInfo,
-    storageVolumeGetXMLDesc,
-    storageVolumeGetPath
+    .name = "storage",
+    .open = storageOpen,
+    .close = storageClose,
+    .numOfPools = storageNumPools,
+    .listPools = storageListPools,
+    .numOfDefinedPools = storageNumDefinedPools,
+    .listDefinedPools = storageListDefinedPools,
+    .findPoolSources = storageFindPoolSources,
+    .poolLookupByName = storagePoolLookupByName,
+    .poolLookupByUUID = storagePoolLookupByUUID,
+    .poolLookupByVolume = storagePoolLookupByVolume,
+    .poolCreateXML = storagePoolCreate,
+    .poolDefineXML = storagePoolDefine,
+    .poolBuild = storagePoolBuild,
+    .poolUndefine = storagePoolUndefine,
+    .poolCreate = storagePoolStart,
+    .poolDestroy = storagePoolDestroy,
+    .poolDelete = storagePoolDelete,
+    .poolRefresh = storagePoolRefresh,
+    .poolGetInfo = storagePoolGetInfo,
+    .poolGetXMLDesc = storagePoolDumpXML,
+    .poolGetAutostart = storagePoolGetAutostart,
+    .poolSetAutostart = storagePoolSetAutostart,
+    .poolNumOfVolumes = storagePoolNumVolumes,
+    .poolListVolumes = storagePoolListVolumes,
+
+    .volLookupByName = storageVolumeLookupByName,
+    .volLookupByKey = storageVolumeLookupByKey,
+    .volLookupByPath = storageVolumeLookupByPath,
+    .volCreateXML = storageVolumeCreateXML,
+    .volDelete = storageVolumeDelete,
+    .volGetInfo = storageVolumeGetInfo,
+    .volGetXMLDesc = storageVolumeGetXMLDesc,
+    .volGetPath = storageVolumeGetPath,
 };