diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91778f3..9915e90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
 ## TODO
 
 - Sorting of bookmarks
@@ -10,16 +17,18 @@
 - Look into compatibility with del.icio.us, so we can make use of existing browser integration
 
 
-## v1.1.0 (unreleased)
+## [Unreleased]
+### Added
 
-- Removed some dependencies
+### Changed
 - Updated dependencies
 - Updated MaterializeCSS and jQuery
 
+### Removed
+- Removed some dependencies
 
-## v1.0.0
 
-2016-12-29
+## [1.0.0] - 2016-12-29
 
 - json view of public tag pages, returns all items
 - feed (rss/atom) view of public tag pages, returns latest 15
@@ -54,9 +63,7 @@
 - Updated MaterializeCSS and jQuery
 
 
-## v0.2.0
-
-2016-08-02
+## [0.2.0] - 2016-08-02
 
 - Favicon courtesy Freepik on flaticon.com
 - Tag tags for easy adding of tags
@@ -67,9 +74,7 @@
 - Option to strip parameters from url (like '?utm_source=social')
 
 
-## v0.1.0
-
-2016-07-26
+## [0.1.0] - 2016-07-26
 
 - Initial release
 - Flask application with functionality to add users, add and edit bookmarks,