diff --git a/gitdch b/gitdch
index 176bb0a..271139b 100755
--- a/gitdch
+++ b/gitdch
@@ -7,6 +7,7 @@ import logging
 import os
 import re
 import sys
+import textwrap
 
 import git
 
@@ -267,11 +268,17 @@ for version in versions:
         )
     )
 
-    # pylint: disable=consider-using-f-string
-    changelog_lines.extend([
-      '  * {0}\n'.format(message)
-      for message in version['messages']
-    ])
+    for message in version['messages']:
+        for idx, line in enumerate(
+            textwrap.wrap(message, 76, break_long_words=True)
+        ):
+            # pylint: disable=consider-using-f-string
+            changelog_lines.append(
+                '{0}{1}\n'.format(
+                    '  * ' if not idx else '    ',
+                    line
+                )
+            )
 
     # pylint: disable=consider-using-f-string
     changelog_lines.append(