diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba4a9c2..df9b235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ placeholders in the `players` fields.
 * Stabilized field `numplayers`.
 * V Rising (2022) - Updated `options.port_query_offset` to `[1, 15]` (#438).
 * BeamMP (2021) - Added support.
+* Xonotic (2011) - Added support.
 * Call of Duty: Black Ops 3 (2015) - Added support.
 * Unreal 2: The Awakening - XMP - Added support.
 
diff --git a/GAMES_LIST.md b/GAMES_LIST.md
index 1dd1c82..02247e8 100644
--- a/GAMES_LIST.md
+++ b/GAMES_LIST.md
@@ -323,6 +323,7 @@
 | wolfenstein          | Wolfenstein                                      |                                                 |
 | wot                  | Wheel of Time                                    |                                                 |
 | wurmunlimited        | Wurm Unlimited                                   | [Valve Protocol](#valve)                        |
+| xonotic              | Xonotic                                          |                                                 |
 | xpandrally           | Xpand Rally                                      |                                                 |
 | zombiemaster         | Zombie Master                                    | [Valve Protocol](#valve)                        |
 | zps                  | Zombie Panic: Source                             | [Valve Protocol](#valve)                        |
diff --git a/lib/games.js b/lib/games.js
index 17c93b4..5e03096 100644
--- a/lib/games.js
+++ b/lib/games.js
@@ -2742,6 +2742,14 @@ export const games = {
     },
     release_year: 2006
   },
+  xonotic: {
+    name: 'Xonotic',
+    options: {
+      port: 26000,
+      protocol: 'quake3'
+    },
+    release_year: 2011
+  },
   xpandrally: {
     name: 'Xpand Rally',
     options: {