diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
index e1d0243e..ea4b9b4e 100755
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@@ -1,22 +1,18 @@
+## {{if .Versions}}[Unreleased]{{end}}
 {{range .Versions}}
 <a name="{{.Tag.Name}}"></a>
-## {{if .Tag.Previous}}[{{.Tag.Name}}]({{$.Info.RepositoryURL}}/compare/{{.Tag.Previous.Name}}...{{.Tag.Name}}){{else}}{{.Tag.Name}}{{end}} ({{datetime "2006-01-02" .Tag.Date}})
-{{range .CommitGroups}}
-### {{.Title}}
-{{range .Commits}}
-* {{.Subject}}{{end}}
+## {{if .Tag.Previous}}[{{.Tag.Name}}]{{else}}{{.Tag.Name}}{{end}} - {{datetime "2006-01-02" .Tag.Date}}{{range .CommitGroups}}
+### {{.Title}}{{range .Commits}}
+- {{if .Scope}}**{{.Scope}}:** {{end}}{{.Subject}}{{end}}
 {{end}}{{if .RevertCommits}}
-### Reverts
-{{range .RevertCommits}}
-* {{.Revert.Header}}{{end}}
-{{end}}{{if .MergeCommits}}
-### Pull Requests
-{{range .MergeCommits}}
-* {{.Header}}{{end}}
+### Reverts{{range .RevertCommits}}
+- {{.Revert.Header}}{{end}}
 {{end}}{{range .NoteGroups}}
 ### {{.Title}}
 {{range .Notes}}
 {{.Body}}
 {{end}}
-{{end}}
+{{end}}{{end}}{{if .Versions}}
+[Unreleased]: {{.Info.RepositoryURL}}/compare/{{$latest := index .Versions 0}}{{$latest.Tag.Name}}...HEAD{{range .Versions}}{{if .Tag.Previous}}
+[{{.Tag.Name}}]: {{$.Info.RepositoryURL}}/compare/{{.Tag.Previous.Name}}...{{.Tag.Name}}{{end}}{{end}}
 {{end}}
\ No newline at end of file