diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a5a7900980a2666880932a7a02971765a3444627..befdb51d1320934c665b53be3beb4a0d49abe494 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Added
+~~~~~
+
+* Allow configuring database options
+
 Changed
 ~~~~~~~
 
diff --git a/aleksis/apps/untis/settings.py b/aleksis/apps/untis/settings.py
index 0198b61f7baadc323690372686e641fd8a0206c0..69db865e2d05c1d9241aca7d19b7ddf0e1c3a559 100644
--- a/aleksis/apps/untis/settings.py
+++ b/aleksis/apps/untis/settings.py
@@ -9,5 +9,7 @@ if _settings.get("untis.database.enabled"):
             "PASSWORD": _settings.get("untis.database.password", None),
             "HOST": _settings.get("untis.database.host", "127.0.0.1"),
             "PORT": _settings.get("untis.database.port", 3306),
+            "CONN_MAX_AGE": _settings.get("untis.database.conn_max_age", 0),
+            "OPTIONS": _settings.get("untis.database.options", {}),
         }
     }