diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
new file mode 100755
index 000000000..ab3d0466a
--- /dev/null
+++ b/.chglog/CHANGELOG.tpl.md
@@ -0,0 +1,20 @@
+{{ 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 -}}
+{{ range .Commits -}}
+* {{ .Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
\ No newline at end of file
diff --git a/.chglog/config.yml b/.chglog/config.yml
new file mode 100755
index 000000000..5fc43a644
--- /dev/null
+++ b/.chglog/config.yml
@@ -0,0 +1,26 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/photoprism/photoprism
+options:
+  commits:
+    # filters:
+    #   Type:
+    #     - feat
+    #     - fix
+    #     - perf
+    #     - refactor
+  commit_groups:
+    # title_maps:
+    #   feat: Features
+    #   fix: Bug Fixes
+    #   perf: Performance Improvements
+    #   refactor: Code Refactoring
+  header:
+    pattern: "^(.*)$"
+    pattern_maps:
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 9311374b4..000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Changelog
-=========
-
-Pre-release
------------
-
-* 05/09/2018 Improved Docker configuration, pushed image to Docker Hub (https://hub.docker.com/r/photoprism/photoprism/),
-  added Makefile and migrated to go modules
\ No newline at end of file
diff --git a/README.md b/README.md
index 54c576881..a5d4240a0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ PhotoPrism: Browse your life in pictures
 [ci]: https://travis-ci.org/photoprism/photoprism
 [docs]: https://docs.photoprism.org/en/latest/
 
-We love taking photos and they belong to our most valuable (and storage consuming) assets. Privacy concerns - and the wish to properly
+We love taking photos. They belong to our most valuable (and storage consuming) assets. Privacy concerns - and the wish to properly
 archive them for the next generation - brought us to the conclusion that existing cloud solutions are not the right tool to keep them organized.
 At the same time, traditional desktop software like Adobe Lightroom lacks many features and can only be used on a single computer.
 That's why we started working on an easy-to-use application that can be hosted at home or on a private server.