diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fc5a0841..8ec4f0a77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,6 +95,23 @@ review_docs:
     name: review/docs/$CI_COMMIT_REF_NAME
     url: http://$CI_PROJECT_NAMESPACE.pages.funkwhale.audio/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/docs-review/index.html
 
+changelog_snippet:
+  interruptible: true
+  image: alpine:3.15
+  stage: lint
+  before_script:
+    - apk add git
+    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+  script:
+    - git diff --name-only FETCH_HEAD | grep "changes/changelog.d/*"
+  rules:
+    - if: $CI_COMMIT_AUTHOR == 'Renovate Bot <bot@dev.funkwhale.audio>'
+      when: never
+    - if: $CI_MERGE_REQUEST_TITLE =~ /NOCHANGELOG/
+      when: never
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+
+
 black:
   interruptible: true
   image: python:3.6
diff --git a/changes/changelog.d/ci-changelog-snippet.misc b/changes/changelog.d/ci-changelog-snippet.misc
new file mode 100644
index 000000000..a728b3db9
--- /dev/null
+++ b/changes/changelog.d/ci-changelog-snippet.misc
@@ -0,0 +1 @@
+Add a CI job to check if changelog snippet is available