diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90db4c24e..3c473aca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Minor: Disable checking for updates on unsupported platforms (#1874)
 - Bugfix: Fix bug preventing users from setting the highlight color of the second entry in the "User" highlights tab (#1898)
 - Bugfix: /usercard command will now respect the "Automatically close user popup" setting (#1918)
+- Bugfix: Handle symlinks properly when saving commands & settings (#1856, #1908)
 
 ## 2.2.0
 
diff --git a/lib/settings b/lib/settings
index a5040463c..6de3a2778 160000
--- a/lib/settings
+++ b/lib/settings
@@ -1 +1 @@
-Subproject commit a5040463c01e6b0e562eab82e0decb29cab9b450
+Subproject commit 6de3a27784745959ab261df219880cddc9263ff9
diff --git a/lib/settings.pri b/lib/settings.pri
index 0c54456ff..5ac990748 100644
--- a/lib/settings.pri
+++ b/lib/settings.pri
@@ -3,6 +3,7 @@ DEFINES += PAJLADA_SETTINGS_BOOST_FILESYSTEM
 
 SOURCES += \
            $$PWD/settings/src/settings/settingdata.cpp \
-           $$PWD/settings/src/settings/settingmanager.cpp
+           $$PWD/settings/src/settings/settingmanager.cpp \
+           $$PWD/settings/src/settings/detail/realpath.cpp
 
 INCLUDEPATH += $$PWD/settings/include/