diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..491deae
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..8256fbf
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,46 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 20 * * 4'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+        languages: python, cpp
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    - run: |
+           sudo apt install libgeoip-dev
+           python setup.py build
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.travis.yml b/.travis.yml
index 4089619..e1b6762 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,16 @@
 ---
 language: python
-python:
-  - '2.6'
-  - '2.7'
-  - '3.3'
-  - '3.4'
+matrix:
+  include:
+    - python: '2.6'
+      dist: trusty
+    - python: '2.7'
+    - python: '3.3'
+      dist: trusty
+    - python: '3.4'
+    - python: '3.5'
+    - python: '3.6'
+    - python: '3.7'
 before_install:
   - git clone git://github.com/maxmind/geoip-api-c
   - cd geoip-api-c
diff --git a/README.rst b/README.rst
index 0261229..ac0974b 100644
--- a/README.rst
+++ b/README.rst
@@ -2,6 +2,20 @@
 MaxMind GeoIP Legacy Python Extension API
 =========================================
 
+End of Life
+-----------
+
+MaxMind will be retiring the GeoIP Legacy databases at the end of May
+2022. Until then, this library will only receive critical security and bug
+fixes. Support for this library will end completely with the last release of
+the legacy GeoIP databases.
+
+We recommend that you upgrade to our GeoIP2 databases. You can read these
+from Python using `our GeoIP2 Python API <https://github.com/maxmind/GeoIP2-python>`_.
+
+See `our blog post <https://blog.maxmind.com/2020/06/01/retirement-of-geoip-legacy-downloadable-databases-in-may-2022/>`_
+for more information.
+
 Requirements
 ------------