diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..4ea3b7a3d
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '17 21 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: python
+            build-mode: none
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v6.0.2
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        queries: security-and-quality
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{ matrix.language }}"
diff --git a/CHANGES.rst b/CHANGES.rst
index 690bb1396..486c8ec36 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -35,6 +35,7 @@ fixes:
 - chore: update errbot-backend-slackv3 version to 0.3.2 (#1743)
 - fix: allow webtest to work on python 3.13 (#1729)
 - fix: add command in logged when blocked by cmdfilter (#1631)
+- chore: add codeql analysis (#1600)
 
 
 v6.2.0 (2024-01-01)