diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp
index e91fcef95..43b8cdf6f 100644
--- a/src/gui/osdlang_setup.cpp
+++ b/src/gui/osdlang_setup.cpp
@@ -153,7 +153,7 @@ CMenuOptionStringChooser* COsdLangSetup::getTzItems()
 				if(zptr)
 					zone = zptr;
 				//printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str());
-				if (access("/usr/share/zoneinfo/" + zone, R_OK))
+				if (access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK))
 					printf("[neutrino] timezone file '%s' not installed\n", zone.c_str());
 				else
 				{
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 5162af196..e29e5b962 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -498,7 +498,7 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
 					const char *zptr = xmlGetAttribute(search, "zone");
 					if(zptr)
 						zone = zptr;
-					if (!access(DATADIR "/zoneinfo/" + zone, R_OK))
+					if (!access(TARGET_PREFIX "/share/zoneinfo/" + zone, R_OK))
 						found = true;
 					break;
 				}
@@ -509,7 +509,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 = DATADIR "/zoneinfo/" + zone;
+		std::string cmd = TARGET_PREFIX "/share/zoneinfo/" + zone;
 		printf("symlink %s to /etc/localtime\n", cmd.c_str());
 		if (unlink("/etc/localtime"))
 			perror("unlink failed");