diff --git a/gen-changelog.py b/gen-changelog.py
index 59f6ae18..4eb5f4f7 100644
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -75,13 +75,15 @@ def process_commit(lines, files):
     top_line = ' '.join(fields)
     print top_line.strip()
     print
-    if not fileincommit:
-        for f in files:
-            print '\t* %s:' % f
 
     if subject_line_index > 0:
         print '\t', lines[subject_line_index]
 
+    if not fileincommit:
+        for f in files:
+            print '\t* %s:' % f
+        print
+
     if first_cl_body_line_index > 0:
         for l in lines[first_cl_body_line_index:]:
             if l.startswith('Signed-off-by:'):