diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 000000000..7dca634c8
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,34 @@
+name: Changelog Generator
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Generate changelog content
+      uses: heinrichreimer/action-github-changelog-generator@v2.1.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        
+    - name: Commit changes
+      run: |
+        if [ -n "$(git status --short)" ]
+        then
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git commit -m "Update Changelog" -a
+        else
+          echo "No changes to commit - skipping"
+        fi
+
+    - name: Push
+      uses: ad-m/github-push-action@v0.5.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: master