diff --git a/core/ChangeLog b/core/ChangeLog
index dd23236df..54f6bd779 100644
--- a/core/ChangeLog
+++ b/core/ChangeLog
@@ -1,4 +1,30 @@
-Version 2.x.x [not yet released]
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [Unreleased]
+
+_Most likely to be released on July 1st._
+
+### Added
+- Soft lock.  #958
+- Auto lock.  #1027
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- Fix cancel icon in PIN dialog.  #1042
+
+### Security
+
+
+------------
+
+### Older changelog:
 
 Version 2.3.1 [Jun 2020]
 * Refactor Bitcoin signing
diff --git a/legacy/firmware/ChangeLog b/legacy/firmware/ChangeLog
index 9df1ed73c..1020afdd0 100644
--- a/legacy/firmware/ChangeLog
+++ b/legacy/firmware/ChangeLog
@@ -1,4 +1,24 @@
-Version 1.x.x [not yet released]
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [Unreleased]
+
+### Added
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+------------
+
+### Older changelog:
 
 Version 1.9.1 [Jun 2020]
 * Stream previous tx also for Segwit inputs