--- a/hgext/convert/cvsps.py	Tue Oct 04 19:43:45 2011 -0400
+++ b/hgext/convert/cvsps.py	Wed Oct 05 10:28:39 2011 +0200
@@ -363,8 +363,14 @@
         elif state == 8:
             # store commit log message
             if re_31.match(line):
-                state = 5
-                store = True
+                cpeek = peek
+                if cpeek.endswith('\n'):
+                    cpeek = cpeek[:-1]
+                if re_50.match(cpeek):
+                    state = 5
+                    store = True
+                else:
+                    e.comment.append(line)
             elif re_32.match(line):
                 state = 0
                 store = True