diff --git a/.chglog/config.yml b/.chglog/config.yml
index f8e13fd2f..b25af0db7 100755
--- a/.chglog/config.yml
+++ b/.chglog/config.yml
@@ -18,7 +18,7 @@ options:
        PERF: Performance Improvements
        INTERNAL: Internal Changes
   header:
-    pattern: "^\\[(\\w*)\\]\\s(?:(\\w*)\\:\\s)?(.*)$"
+    pattern: "^\\[(\\w*)\\]\\s(?:([^\\:]*)\\:\\s)?(.*)$"
     pattern_maps:
       - Type
       - Scope
diff --git a/.chglog/release-config.yml b/.chglog/release-config.yml
index 8c9058741..9575aa4d7 100755
--- a/.chglog/release-config.yml
+++ b/.chglog/release-config.yml
@@ -17,7 +17,7 @@ options:
        PERF: Performance Improvements
        INTERNAL: Internal Changes
   header:
-    pattern: "^\\[(\\w*)\\]\\s(?:(\\w*)\\:\\s)?(.*)$"
+    pattern: "^\\[(\\w*)\\]\\s(?:([^\\:]*)\\:\\s)?(.*)$"
     pattern_maps:
       - Type
       - Scope
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29faecf48..276935bf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-proj
 ## [v0.1.0] - 2018-06-26
 ### Bug Fixes
 - Fix some typos in log messages ([#17](https://github.com/SAP/ui5-project/issues/17)) [`1f2f2fd`](https://github.com/SAP/ui5-project/commit/1f2f2fd164abaf449cc5e7d94ec792f469710207)
-- npm translator: Fix endless loop in case of dependency cycles ([#15](https://github.com/SAP/ui5-project/issues/15)) [`cf31112`](https://github.com/SAP/ui5-project/commit/cf3111288278e8dd36a09b549bd2b254e86af041)
+- **npm translator:** Fix endless loop in case of dependency cycles ([#15](https://github.com/SAP/ui5-project/issues/15)) [`cf31112`](https://github.com/SAP/ui5-project/commit/cf3111288278e8dd36a09b549bd2b254e86af041)
 
 ### Internal Changes
 - Update ui5-builder and ui5-logger dependency [`c4aaa81`](https://github.com/SAP/ui5-project/commit/c4aaa81ed813fb96a24a289ceb54bc2537bc70e7)
@@ -20,7 +20,7 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-proj
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 ### Bug Fixes
-- npm t8r: Fix collection fallback with missing package.json [`578466f`](https://github.com/SAP/ui5-project/commit/578466fdedf871091874c93d1a9305859e34e3ed)
+- **npm t8r:** Fix collection fallback with missing package.json [`578466f`](https://github.com/SAP/ui5-project/commit/578466fdedf871091874c93d1a9305859e34e3ed)
 
 ### Internal Changes
 - Prepare npm release [`0467b6a`](https://github.com/SAP/ui5-project/commit/0467b6ac2e87dadd7319fe02901c3b24a3901663)
@@ -28,12 +28,12 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-proj
 - Add chglog config + npm release scripts [`574f976`](https://github.com/SAP/ui5-project/commit/574f9761debb0cf527e4dfe9d09a73b7abfecc49)
 - Update dependencies [`51ddbc8`](https://github.com/SAP/ui5-project/commit/51ddbc854e1e28c6455cbe98fdf517601e560f71)
 - Add missing test module dependencies [`0d1d57a`](https://github.com/SAP/ui5-project/commit/0d1d57a0f4643ea171b134d1639404fc51fdb051)
-- npm t8r: Improve handling of missing package.json [`4b32134`](https://github.com/SAP/ui5-project/commit/4b321345139058dc821fb08c4556aff88366ea86)
 - Add travis CI badge + package.json cleanup [`7769590`](https://github.com/SAP/ui5-project/commit/776959063ab673a92ebfd4cf4c7ba253aae158a8)
 - Fix links to CONTRIBUTING.md file [`734a870`](https://github.com/SAP/ui5-project/commit/734a870d6a68f0370626d5a17906afabf1cd27d1)
 - **ESLint:** Activate no-var rule [`6916828`](https://github.com/SAP/ui5-project/commit/6916828560c1765bdd64306c8b1c4950a36f0c8b)
 - **ESLint:** Activate no-console [`df406da`](https://github.com/SAP/ui5-project/commit/df406dab0888b16b9c66f4fe5a2d7e026ad9f4f4)
 - **Travis:** Add node.js 10 to test matrix [`5f26276`](https://github.com/SAP/ui5-project/commit/5f2627668b7faa554b8c3810899828d3be6fd63f)
+- **npm t8r:** Improve handling of missing package.json [`4b32134`](https://github.com/SAP/ui5-project/commit/4b321345139058dc821fb08c4556aff88366ea86)
 
 
 [v0.1.0]: https://github.com/SAP/ui5-project/compare/v0.0.1...v0.1.0