diff --git a/scripts/util/changelog-parser.php b/scripts/util/changelog-parser.php
new file mode 100644
index 000000000..2c3345596
--- /dev/null
+++ b/scripts/util/changelog-parser.php
@@ -0,0 +1,171 @@
+<?php
+
+$line_cnt = 0;
+$commit = "";
+$author = "";
+$date = "";
+$message = "";
+
+while($line = fgets(STDIN)) {
+    $line_cnt = $line_cnt + 1;
+    $res = preg_match('/^commit\s+(.*)\n/', $line, $match);
+    if ($res) {
+        if ($line_cnt != 1) {
+	         process_message($commit, $author, $date, $message);
+         }
+        $commit = $match[1];
+	$author = "";
+	$date = "";
+	$message = "";
+        continue;
+    }
+
+    $res = preg_match('/^Author:\s+(.*)\n/', $line, $match);
+    if ($res) {
+        $author = $match[1];
+        continue;
+    }
+
+    $res = preg_match('/^Date:\s+(.*)\n/', $line, $match);
+    if ($res) {
+        $date = $match[1];
+	continue;
+    }
+
+    $res = preg_match('/^    \s*(.*)/', $line, $match);
+    if ($res) {
+        $message .= $match[1] . "\n";
+        continue;
+    }
+}
+# Process pending (last) message.
+process_message($commit, $author, $date, $message);
+
+
+function process_message($commit, $author, $date, $message)
+{
+  $valid_extra_fields = array("signed-off-by", "gnupg-bug-id",
+                              "fixes-commit", "reported-by",
+                              "debian-bug-id", "suggested-by",
+                              "regression-due-to", "co-authored-by",
+                              "proofread-by", "see-also", "some-comments-by",
+                              "hat-tip-to");
+
+    # We want at least two lines (simplifies the logic).
+    $message = $message . "\n\n";
+
+    $message_lines = explode("\n", $message);
+    $first_line = array_shift($message_lines);
+
+    $keywords = array();
+    $title = "(no title)";
+    $changelog = array();
+    $summary = array();
+    $testplan = array();
+    $extra = array();
+
+    if (strncmp($first_line, "*", 1) == 0
+        || strncmp($first_line, "(", 1) == 0
+        || $message_lines[0] != "") {
+      # No title line.
+      array_unshift($message_lines, $first_line);
+    } else {
+        $title = $first_line;
+        $blank = array_shift($message_lines);
+        if (strpos($first_line, ":") !== false) {
+            list($keywords, $title) = explode(':', $first_line, 2);
+            $keywords = explode(',', $keywords);
+            $keywords = array_map('trim', $keywords);
+        }
+        # TODO: Verify that the keywords are all valid.
+    }
+
+    # ChangeLog style entries.
+    $in_par = false;
+    do {
+      $line = array_shift($message_lines);
+      if ($line === null) {
+        break;
+      }
+
+      $is_separator = preg_match('/^\s*--\s*$/', $line);
+      $is_blank = preg_match('/^\s*$/', $line);
+      $is_change = preg_match('/^[*(]/', $line);
+      if ($is_separator) {
+          break;
+      } else if ($is_blank) {
+          $in_par = false;
+      } else if ($in_par) {
+          $changelog[] = $line;
+      } else if ($is_change) {
+          $changelog[] = $line;
+          $in_par = true;
+      } else {
+        # Not $in_par, unexpected input.
+        array_unshift($message_lines, $line);
+        break;
+      }
+    } while (true);
+
+    # Summary (aka test plan for now) and extra fields.
+    $add_blank = false;
+    $at_beginning = true;
+    do {
+      $line = array_shift($message_lines);
+      if ($line === null) {
+        break;
+      }
+      $is_blank = preg_match('/^\s*$/', $line);
+      $is_extra = preg_match('/^([-a-zA-Z]+):\s*(.*)$/', $line, $match);
+      $key = null;
+      $val = null;
+      if ($is_extra) {
+        $key = $match[1];
+        $val = $match[2];
+      }
+      if (! in_array(strtolower($key), $valid_extra_fields))
+      {
+        $is_extra = false;
+      }
+
+      if ($is_extra) {
+        $extra[$key] = $val;
+      } else if ($is_blank) {
+        $add_blank = true;
+      } else {
+        if ($add_blank) {
+          if (! $at_beginning) {
+            $summary[] = "";
+          }
+          $add_blank = false;
+        }
+        $summary[] = $line;
+        $at_beginning = false;
+      }
+    } while (true);
+
+    # Post-processing.
+    $title = trim($title);
+
+    echo "C $commit\n";
+    echo "A $author\n";
+    echo "D $date\n";
+    foreach ($keywords as $kw) {
+      echo "K $kw\n";
+    }
+    echo "T $title\n";
+    foreach ($changelog as $log) {
+      echo "L $log\n";
+    }
+    foreach ($summary as $line) {
+      echo "S $line\n";
+    }
+    foreach ($testplan as $line) {
+      echo "P $line\n";
+    }
+    foreach ($extra as $key => $value) {
+      echo "X $key: $value\n";
+    }
+}
+
+?>