diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 43ac4c3d42159317e420c67a2aaacf0f9ed4824a..7495982483dc43a89ad0321f180c706deb721891 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,7 @@ Fixed
 Changed
 ~~~~~~~
 
+* Configuration files are now deep merged by default
 * Improvements for shell_plus module loading
   * core.Group model now takes precedence over auth.Group
   * Name collisions are resolved by prefixing with the app label
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index ae84059c048c8aa812c562acfa2f8dafb0ff358f..089bf17d6643e1cb73c1f1589cb2f0891f56f3a1 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -14,6 +14,7 @@ IN_PYTEST = "PYTEST_CURRENT_TEST" in os.environ or "TOX_ENV_DIR" in os.environ
 
 ENVVAR_PREFIX_FOR_DYNACONF = "ALEKSIS"
 DIRS_FOR_DYNACONF = ["/etc/aleksis"]
+MERGE_ENABLED_FOR_DYNACONF = True
 
 SETTINGS_FILE_FOR_DYNACONF = []
 for directory in DIRS_FOR_DYNACONF:
@@ -29,6 +30,7 @@ for directory in DIRS_FOR_DYNACONF:
 _settings = LazySettings(
     ENVVAR_PREFIX_FOR_DYNACONF=ENVVAR_PREFIX_FOR_DYNACONF,
     SETTINGS_FILE_FOR_DYNACONF=SETTINGS_FILE_FOR_DYNACONF,
+    MERGE_ENABLED_FOR_DYNACONF=MERGE_ENABLED_FOR_DYNACONF,
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)