diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f0dbd19..fbbec2a7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,6 +15,12 @@ jobs:
       - name: extract version
         id: version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
+      - name: create changelog
+        id: changelog
+        uses: jaywcjlove/changelog-generator@main
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}'
       - name: create archive
         run: make archive
         env:
@@ -22,8 +28,10 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
+          body: |
+            ${{ steps.changelog.outputs.compareurl }}
+            ${{ steps.changelog.outputs.changelog }}
           files: ahriman-*-src.tar.xz
           fail_on_unmatched_files: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.version.outputs.VERSION }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..c972f8d5
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,126 @@
+# Changelog
+
+## [0.21.1](https://github.com/arcan1s/ahriman/tree/0.21.1) (2021-04-04)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.21.0...0.21.1)
+
+## [0.21.0](https://github.com/arcan1s/ahriman/tree/0.21.0) (2021-04-04)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.20.0...0.21.0)
+
+## [0.20.0](https://github.com/arcan1s/ahriman/tree/0.20.0) (2021-03-31)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.19.0...0.20.0)
+
+## [0.19.0](https://github.com/arcan1s/ahriman/tree/0.19.0) (2021-03-30)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.18.0...0.19.0)
+
+## [0.18.0](https://github.com/arcan1s/ahriman/tree/0.18.0) (2021-03-29)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.17.0...0.18.0)
+
+## [0.17.0](https://github.com/arcan1s/ahriman/tree/0.17.0) (2021-03-29)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.16.0...0.17.0)
+
+**Implemented enhancements:**
+
+- Sign command [\#7](https://github.com/arcan1s/ahriman/issues/7)
+- Provide extended setup help command [\#6](https://github.com/arcan1s/ahriman/issues/6)
+
+**Merged pull requests:**
+
+- Setup command [\#9](https://github.com/arcan1s/ahriman/pull/9) ([arcan1s](https://github.com/arcan1s))
+- add sign command [\#8](https://github.com/arcan1s/ahriman/pull/8) ([arcan1s](https://github.com/arcan1s))
+
+## [0.16.0](https://github.com/arcan1s/ahriman/tree/0.16.0) (2021-03-28)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.15.0...0.16.0)
+
+**Implemented enhancements:**
+
+- Review unsafe option [\#4](https://github.com/arcan1s/ahriman/issues/4)
+- Split functions class to module package [\#3](https://github.com/arcan1s/ahriman/issues/3)
+- Import from another repository [\#2](https://github.com/arcan1s/ahriman/issues/2)
+- Tests [\#1](https://github.com/arcan1s/ahriman/issues/1)
+
+**Merged pull requests:**
+
+- Add tests \(\#1\) [\#5](https://github.com/arcan1s/ahriman/pull/5) ([arcan1s](https://github.com/arcan1s))
+
+## [0.15.0](https://github.com/arcan1s/ahriman/tree/0.15.0) (2021-03-20)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.14.1...0.15.0)
+
+## [0.14.1](https://github.com/arcan1s/ahriman/tree/0.14.1) (2021-03-17)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.14.0...0.14.1)
+
+## [0.14.0](https://github.com/arcan1s/ahriman/tree/0.14.0) (2021-03-16)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.13.0...0.14.0)
+
+## [0.13.0](https://github.com/arcan1s/ahriman/tree/0.13.0) (2021-03-15)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.12.2...0.13.0)
+
+## [0.12.2](https://github.com/arcan1s/ahriman/tree/0.12.2) (2021-03-15)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.12.1...0.12.2)
+
+## [0.12.1](https://github.com/arcan1s/ahriman/tree/0.12.1) (2021-03-15)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.12.0...0.12.1)
+
+## [0.12.0](https://github.com/arcan1s/ahriman/tree/0.12.0) (2021-03-15)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.7...0.12.0)
+
+## [0.11.7](https://github.com/arcan1s/ahriman/tree/0.11.7) (2021-03-14)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.6...0.11.7)
+
+## [0.11.6](https://github.com/arcan1s/ahriman/tree/0.11.6) (2021-03-13)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.5...0.11.6)
+
+## [0.11.5](https://github.com/arcan1s/ahriman/tree/0.11.5) (2021-03-13)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.4...0.11.5)
+
+## [0.11.4](https://github.com/arcan1s/ahriman/tree/0.11.4) (2021-03-13)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.3...0.11.4)
+
+## [0.11.3](https://github.com/arcan1s/ahriman/tree/0.11.3) (2021-03-12)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.2...0.11.3)
+
+## [0.11.2](https://github.com/arcan1s/ahriman/tree/0.11.2) (2021-03-12)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.1...0.11.2)
+
+## [0.11.1](https://github.com/arcan1s/ahriman/tree/0.11.1) (2021-03-11)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.11.0...0.11.1)
+
+## [0.11.0](https://github.com/arcan1s/ahriman/tree/0.11.0) (2021-03-11)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.10.0...0.11.0)
+
+## [0.10.0](https://github.com/arcan1s/ahriman/tree/0.10.0) (2021-03-10)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.9.1...0.10.0)
+
+## [0.9.1](https://github.com/arcan1s/ahriman/tree/0.9.1) (2021-03-09)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/0.9.0...0.9.1)
+
+## [0.9.0](https://github.com/arcan1s/ahriman/tree/0.9.0) (2021-03-08)
+
+[Full Changelog](https://github.com/arcan1s/ahriman/compare/53d21d6496ab902b664a678a2f2d3a7f4e96d8d1...0.9.0)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/Makefile b/Makefile
index 34fe7a2c..d6856e2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-.PHONY: archive archive_directory archlinux check clean directory push tests version
+.PHONY: archive archive_directory archlinux changelog check clean directory push tests version
 .DEFAULT_GOAL := archlinux
 
 PROJECT := ahriman
 
-FILES := AUTHORS COPYING CONFIGURING.md README.md package src setup.py
+FILES := AUTHORS CHANGELOG.md COPYING CONFIGURING.md README.md package src setup.py
 TARGET_FILES := $(addprefix $(PROJECT)/, $(FILES))
 IGNORE_FILES := package/archlinux src/.mypy_cache
 
@@ -24,6 +24,12 @@ archlinux: archive
 	sed -i "/sha512sums=('[0-9A-Fa-f]*/s/[^'][^)]*/sha512sums=('$$(sha512sum $(PROJECT)-$(VERSION)-src.tar.xz | awk '{print $$1}')'/" package/archlinux/PKGBUILD
 	sed -i "s/pkgver=[0-9.]*/pkgver=$(VERSION)/" package/archlinux/PKGBUILD
 
+changelog:
+ifndef GITHUB_TOKEN
+	$(error GITHUB_TOKEN is required, but not set)
+endif
+	docker run -it --rm -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-changelog-generator -u arcan1s -p ahriman -t $(GITHUB_TOKEN)
+
 check: clean
 	cd src && mypy --implicit-reexport --strict -p "$(PROJECT)"
 	find "src/$(PROJECT)" tests -name "*.py" -execdir autopep8 --exit-code --max-line-length 120 -aa -i {} +
@@ -36,8 +42,8 @@ clean:
 directory: clean
 	mkdir "$(PROJECT)"
 
-push: archlinux
-	git add package/archlinux/PKGBUILD src/ahriman/version.py
+push: archlinux changelog
+	git add package/archlinux/PKGBUILD src/ahriman/version.py CHANGELOG.md
 	git commit -m "Release $(VERSION)"
 	git push
 	git tag "$(VERSION)"