diff --git a/bin/changelog b/bin/changelog
index 9b5b65dd16f..cff84b3dcbc 100755
--- a/bin/changelog
+++ b/bin/changelog
@@ -53,11 +53,11 @@ function getCommitMessage(commitInfo) {
 function processPages(res) {
   var contributions = res.commits.filter(function(commitInfo) {
     var message = commitInfo.commit.message;
-
-    return message.indexOf('Merge pull request #') > -1 || message.indexOf('cherry picked from') > -1;
+    return message.indexOf('Merge pull request #') > -1 || message.indexOf('cherry picked from') > -1 || message.match(/\(#\d+\)\n/)
   }).map(function(commitInfo) {
     var message = getCommitMessage(commitInfo);
     var match = message.match(/#(\d+) from (.*)\//);
+    var squashMatch = message.match(/#(\d+)\)\n/)
     var result = {
       sha: commitInfo.sha
     };
@@ -65,8 +65,11 @@ function processPages(res) {
     if (match) {
       var numAndAuthor = match.slice(1, 3);
 
-      result.number =numAndAuthor[0];
+      result.number = numAndAuthor[0];
       result.title = message.split('\n\n')[1];
+    } else if (squashMatch) {
+      result.number = squashMatch[1];
+      result.title = message.split('\n\n')[0];
     } else {
       result.title = message.split('\n\n')[0];
     }