diff --git a/ChangeLog b/ChangeLog
index 6c37ac48a8..f032e83356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  8 10:19:01 CEST 2008 Daniel Veillard <daniel@veillard.com>
+
+	* python/generator.py: fix an infinite loop bug
+
 Mon Apr  7 14:36:56 CET 2008 Jim Meyering <meyering@redhat.com>
 
 	* tests/vcpupin: Add a test for the 2008-04-04 virsh.c bugfix.
diff --git a/python/generator.py b/python/generator.py
index 578f02c814..cb57bffdf3 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -754,6 +754,9 @@ def writeDoc(name, args, indent, output):
      output.write(indent)
      output.write('"""')
      while len(val) > 60:
+         if val[0] == " ":
+	     val = val[1:]
+	     continue
          str = val[0:60]
          i = string.rfind(str, " ");
          if i < 0: