diff --git a/CHANGELOG b/CHANGELOG
index 3f265d28d..61e57c34e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,9 @@
 -------------------------
  * Make switching to a buffer by name more lenient
  * Add line numbers mechanics to core (Note: line numbers are not yet implemented in emacs and pango)
- * [yi-keymap-vim] add line numbers commands
- * [yi-frontend-vty] show line numbers when appropriate
+ * [yi-keymap-vim] Add line numbers commands
+ * [yi-frontend-vty] Show line numbers when appropriate
+ * [git commit mode] Don't uglify second line when it is a comment
 
 0.17.1 (2017-11-03)
 -------------------
diff --git a/yi-misc-modes/src/Yi/Lexer/GitCommit.x b/yi-misc-modes/src/Yi/Lexer/GitCommit.x
index 797681a55..09c4e2a57 100644
--- a/yi-misc-modes/src/Yi/Lexer/GitCommit.x
+++ b/yi-misc-modes/src/Yi/Lexer/GitCommit.x
@@ -24,9 +24,10 @@ $nl                            { m (const SecondLine) Style.defaultStyle }
 }
 
 -- There should never be anything on the second line of a git commit message
--- so it is styled in a deliberately hideous color scheme.
+-- so it is styled in a deliberately hideous color scheme, unless it's a comment.
 <secondLine> {
-.+                             { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) }
+^\#                            { m (const $ LineComment) Style.commentStyle }
+.                              { c (const $ Style.withFg Style.red `mappend` Style.withBg Style.brown) }
 $nl                            { m (const MessageLine) Style.defaultStyle }
 }