diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml
index a3bc6db..1c1a520 100644
--- a/.forgejo/workflows/integration.yml
+++ b/.forgejo/workflows/integration.yml
@@ -6,11 +6,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - id: forgejo
-        uses: https://code.forgejo.org/actions/setup-forgejo@v1
+        uses: https://code.forgejo.org/actions/setup-forgejo@v2.0.2
         with:
           user: testuser
           password: admin1234
-          image-version: 1.20
+          image-version: 9
 
       - name: push self
         run: |
@@ -33,6 +33,9 @@ jobs:
           - !exclamation_mark'
           test "$EXPECTED" = "$(jq -r .body < /tmp/release.json)"
 
+          curl --fail -sS $FORGEJO/api/v1/repos/testuser/upload-download/releases/tags/v1.0 > /tmp/v1.json
+          cat /tmp/v1.json | jq -r .body | grep '<!--start release-notes-assistant-->'
+
       - name: testdata/upload-download-private
         run: |
           export LOOP_DELAY=30
diff --git a/README.md b/README.md
index e879520..eb2cd79 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Upload or download the assets of a release to a Forgejo instance.
 | `verbose` | <p>Increase the verbosity level</p> | `false` | `false` |
 | `override` | <p>Override an existing release by the same <code>{tag}</code></p> | `false` | `false` |
 | `prerelease` | <p>Mark Release as Pre-Release</p> | `false` | `false` |
+| `release-notes-assistant` | <p>Generate release notes with Release Notes Assistant</p> | `false` | `false` |
 <!-- action-docs-inputs source="action.yml" -->
 
 ## Examples
diff --git a/action.yml b/action.yml
index db93c7c..f903b1c 100644
--- a/action.yml
+++ b/action.yml
@@ -43,6 +43,9 @@ inputs:
   prerelease:
     description: 'Mark Release as Pre-Release'
     default: 'false'
+  release-notes-assistant:
+    description: 'Generate release notes with Release Notes Assistant'
+    default: 'false'
 
 runs:
   using: "composite"
@@ -57,6 +60,8 @@ runs:
         # A trailing / will mean http://forgejo//api/v1 is used
         # and it always 401 as of v1.19, because of the double slash
         FORGEJO=${FORGEJO%%/}
+        export SCHEME=${FORGEJO%://*}
+        export HOST=${FORGEJO#*://}
 
         export REPO="${{ inputs.repo }}"
         if test -z "$REPO"; then
@@ -77,6 +82,8 @@ runs:
 
         export PRERELEASE="${{ inputs.prerelease }}"
 
+        export RELEASE_NOTES_ASSISTANT="${{ inputs.release-notes-assistant }}"
+
         export TOKEN="${{ inputs.token }}"
 
         export RELEASE_DIR="${{ inputs.release-dir }}"
diff --git a/forgejo-release.sh b/forgejo-release.sh
index 70c57cf..13c9493 100755
--- a/forgejo-release.sh
+++ b/forgejo-release.sh
@@ -52,15 +52,16 @@ upload_release() {
     ensure_tag
     anchor=$(echo $TAG | sed -e 's/^v//' -e 's/[^a-zA-Z0-9]/-/g')
     if ! $BIN_DIR/tea release create $assets --repo $REPO --note "$RELEASENOTES" --tag $TAG --title "$TITLE" --draft ${releasetype} >& $TMP_DIR/tea.log ; then
-	if grep --quiet 'Unknown API Error: 500' $TMP_DIR/tea.log && grep --quiet services/release/release.go:194 $TMP_DIR/tea.log ; then
-	    echo "workaround v1.20 race condition https://codeberg.org/forgejo/forgejo/issues/1370"
-	    sleep 10
-	    $BIN_DIR/tea release create $assets --repo $REPO --note "$RELEASENOTES" --tag $TAG --title "$TITLE" --draft ${releasetype}
-	else
-	    cat $TMP_DIR/tea.log
-	    return 1
-	fi
+        if grep --quiet 'Unknown API Error: 500' $TMP_DIR/tea.log && grep --quiet services/release/release.go:194 $TMP_DIR/tea.log ; then
+            echo "workaround v1.20 race condition https://codeberg.org/forgejo/forgejo/issues/1370"
+            sleep 10
+            $BIN_DIR/tea release create $assets --repo $REPO --note "$RELEASENOTES" --tag $TAG --title "$TITLE" --draft ${releasetype}
+        else
+            cat $TMP_DIR/tea.log
+            return 1
+        fi
     fi
+    maybe_use_release_note_assistant
     release_draft false
 }
 
@@ -71,6 +72,14 @@ release_draft() {
     api PATCH repos/$REPO/releases/$id --data-raw '{"draft": '$state'}'
 }
 
+maybe_use_release_note_assistant() {
+    if "$RELEASE_NOTES_ASSISTANT"; then
+        curl --fail -s -S -o rna https://code.forgejo.org/forgejo/release-notes-assistant/releases/download/v1.2.3/release-notes-assistant
+        chmod +x ./rna
+        ./rna --storage release --storage-location $TAG --forgejo-url $SCHEME://placeholder:$TOKEN@$HOST --repository $REPO --token $TOKEN release $TAG
+    fi
+}
+
 sign_release() {
     local passphrase
     if test -s "$GPG_PASSPHRASE"; then
diff --git a/testdata/upload-download/.forgejo/workflows/test.yml b/testdata/upload-download/.forgejo/workflows/test.yml
index 39d8a62..be2a6a8 100644
--- a/testdata/upload-download/.forgejo/workflows/test.yml
+++ b/testdata/upload-download/.forgejo/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
           tag: v1.0
           token: FORGEJO_TOKEN
           release-dir: upload-dir
-          release-notes: "RELEASE NOTES"
+          release-notes-assistant: true
           override: true
           verbose: true
       - if: ${{ !startsWith(github.ref, 'refs/tags/v') }}