diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index b0bc04095..ef8768260 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -610,7 +610,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
 					const char *zptr = xmlGetAttribute(search, "zone");
 					if(zptr)
 						zone = zptr;
-					if (!access("/usr/share/zoneinfo/" + zone, R_OK))
+					if (!access(DATADIR "/zoneinfo/" + zone, R_OK))
 						found = true;
 					break;
 				}
@@ -621,7 +621,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
         }
 	if(found) {
 		printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str());
-		std::string cmd = "/usr/share/zoneinfo/" + zone;
+		std::string cmd = DATADIR "/zoneinfo/" + zone;
 		printf("symlink %s to /etc/localtime\n", cmd.c_str());
 		if (unlink("/etc/localtime"))
 			perror("unlink failed");