diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7cc2a83c..502c970d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -48,10 +48,13 @@ jobs:
       run: |
         echo ::set-output name=sha::"$(shasum -a 256 ./release/gitui-mac.tar.gz | awk '{printf $1}')"
 
+    - name: Extract release notes
+      id: release_notes
+      uses: ffurrer2/extract-release-notes@v1
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        #body: 'changelog '
+        body: ${{ steps.release_notes.outputs.release_notes }}
         prerelease: true
         files: |
           ./release/*.tar.gz
diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml
new file mode 100644
index 00000000..c8dbe8c5
--- /dev/null
+++ b/.github/workflows/changes.yml
@@ -0,0 +1,21 @@
+name: changestest
+
+on:
+  push:
+    branches: [ '*' ]
+
+jobs:  
+  log-test:
+    name: Changelog Test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Extract release notes
+      id: extract_release_notes
+      uses: ffurrer2/extract-release-notes@v1
+      with:
+        release_notes_file: ./release-notes.txt
+    - uses: actions/upload-artifact@v1
+      with:
+        name: release-notes
+        path: ./release-notes.txt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a02593c2..1db7aa5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,4 +60,4 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/audit-check@v1
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..9ec7f642
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,29 @@
+# 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/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Added
+- introduced proper changelog
+
+### Changed
+- improve ctrl+c handling so it is checked first and no component needs to worry of blocking it
+
+## [0.2.3] - 2020-05-12
+### Added
+- support more navigation keys: home/end/pageUp/pageDown (#43)
+- highlight current tab a bit better
+
+## [0.2.2] - 2020-05-10
+### Added
+- show tags in commit log (#47)
+- support home/end key in diff (#43)
+
+### Changed
+- close application shortcut is now the standard `ctrl+c`
+- some diff improvements (#42)
+
+### Fixed
+- document tab key to switch tabs (#48)