diff --git a/.github/workflows/pr_release_note_entry.yml b/.github/workflows/pr_release_note_entry.yml
new file mode 100644
index 000000000..345fdfca7
--- /dev/null
+++ b/.github/workflows/pr_release_note_entry.yml
@@ -0,0 +1,17 @@
+name: 'Check PR Release Note Entry'
+
+on:
+  pull_request:
+    branches:
+      - main
+    tags-ignore:
+      - '*.*'  # ignore releases
+
+jobs:
+  release-note-entry:
+    name: 'Checking release note entry for PR ${{ github.event.number }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          test -f ${{ github.workspace }}/newsfragments/${{ github.event.number }}.*
diff --git a/newsfragments/2396.feature.rst b/newsfragments/2396.feature.rst
new file mode 100644
index 000000000..9cfba9618
--- /dev/null
+++ b/newsfragments/2396.feature.rst
@@ -0,0 +1 @@
+GitHub Action to ensure that each pull request into main makes an associated release note entry.