diff --git a/ChangeLog b/ChangeLog
index f65fc67807..dfc2a9afb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 17 11:16:30 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/domain_conf.c: fix virDiskNameToBusDeviceIndex() to allow 0
+	  patch by Guido Günther
+
 Thu Oct 16 19:17:25 +0200 Jim Meyering <meyering@redhat.com>
 
 	build: when po-check fails, say why and suggest a fix
diff --git a/src/domain_conf.c b/src/domain_conf.c
index f59cdaf41a..2bade8dbe9 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -3394,12 +3394,12 @@ char *virDomainConfigFile(virConnectPtr conn,
  * @param devIdx parsed device number
  * @return 0 on success, -1 on failure
  */
-int virDiskNameToBusDeviceIndex(virDomainDiskDefPtr disk,
+int virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk,
                                 int *busIdx,
                                 int *devIdx) {
 
     int idx = virDiskNameToIndex(disk->dst);
-    if (idx < 1)
+    if (idx < 0)
         return -1;
 
     switch (disk->bus) {