diff --git a/changelog.md b/changelog.md
index 1736d91..3fb1237 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,15 @@ 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/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (after version 0.0.5).
 
+## [0.4.0] - 2022-09-11
+### Added
+- Support variable expansion ([Issue #16](https://github.com/KarnerTh/mermerd/issues/16))
+- Added support for attribute keys ([Issue #20](https://github.com/KarnerTh/mermerd/issues/20))
+
+### Changed
+- mermerd will now by default add the attribute key if applicable (PK or FK). If this is undesired, it can be
+  disabled by the `--omitAttributeKeys` flag or the `omitAttributeKeys` config (example is in the readme).
+
 ## [0.3.0] - 2022-09-02
 ### Added
 - Added --selectedTables switch ([PR #12](https://github.com/KarnerTh/mermerd/pull/12))
@@ -82,6 +91,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (after version 0.0
 ### Added
 - Initial release of mermerd
 
+[0.4.0]: https://github.com/KarnerTh/mermerd/releases/tag/v0.4.0
+
 [0.3.0]: https://github.com/KarnerTh/mermerd/releases/tag/v0.3.0
 
 [0.2.1]: https://github.com/KarnerTh/mermerd/releases/tag/v0.2.1
diff --git a/readme.md b/readme.md
index 8835735..f101d95 100644
--- a/readme.md
+++ b/readme.md
@@ -42,6 +42,7 @@ for your operating system. To be able to use it globally on your system, add the
 * Interactive cli (multiselect, search for tables and schemas, etc.)
 * Use it in CI/CD pipeline via a run configuration
 * Either generate plain mermaid syntax or enclose it with mermaid backticks to use directly in e.g. GitHub markdown
+* Show primary and foreign keys
 
 ## Why would I need it / Why should I care?