diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc
index 36ef4ce8b..54f536f3a 100644
--- a/rtgui/main-cli.cc
+++ b/rtgui/main-cli.cc
@@ -145,10 +145,17 @@ int main (int argc, char **argv)
         licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
     }
 
+    if (Glib::path_is_absolute(LENSFUN_DB_PATH)) {
+        options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
+    } else {
+        options.rtSettings.lensfunDbDirectory = Glib::build_filename(exePath, LENSFUN_DB_PATH);
+    }
+
 #else
     argv0 = DATA_SEARCH_PATH;
     creditsPath = CREDITS_SEARCH_PATH;
     licensePath = LICENCE_SEARCH_PATH;
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
 #endif
 
     bool quickstart = dontLoadCache (argc, argv);
diff --git a/rtgui/main.cc b/rtgui/main.cc
index 48f3f2cc7..6cbddc305 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -530,10 +530,17 @@ int main (int argc, char **argv)
         licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
     }
 
+    if (Glib::path_is_absolute (LENSFUN_DB_PATH)) {
+        options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
+    } else {
+        options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, LENSFUN_DB_PATH);
+    }
+    
 #else
     argv0 = DATA_SEARCH_PATH;
     creditsPath = CREDITS_SEARCH_PATH;
     licensePath = LICENCE_SEARCH_PATH;
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
 #endif
 
 
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 2b23e6ef6..d6c4c08f9 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -24,7 +24,6 @@
 #include "addsetids.h"
 #include "guiutils.h"
 #include "version.h"
-#include "config.h"
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -745,8 +744,7 @@ void Options::setDefaults ()
     lastLensProfileDir = "";
     gimpPluginShowInfoDialog = true;
     maxRecentFolders = 15;
-
-    rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
+    rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
 }
 
 Options* Options::copyFrom (Options* other)