diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d6dc59df82..69d8a1b6c0 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -351,7 +351,7 @@ AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
 # Locale kit language files
 local languageDir = [ FDirName $(HAIKU_TOP) src data etc locale languages ] ;
 local languages = [ Glob $(languageDir) : *.language ] ;
-AddFilesToHaikuImage system etc locale languages : $(languages) ;
+AddFilesToHaikuImage system data locale languages : $(languages) ;
 
 local etcFiles = bash_completion inputrc profile teapot.data ;
 etcFiles = $(etcFiles:G=etc) ;
diff --git a/src/kits/locale/Language.cpp b/src/kits/locale/Language.cpp
index bfdf99394f..b252084277 100644
--- a/src/kits/locale/Language.cpp
+++ b/src/kits/locale/Language.cpp
@@ -109,7 +109,7 @@ BLanguage::BLanguage(const char *language)
 	sprintf(name, "locale/languages/%s.language", language);
 
 	BPath path;
-	if (find_directory(B_BEOS_ETC_DIRECTORY, &path) < B_OK) {
+	if (find_directory(B_SYSTEM_DATA_DIRECTORY, &path) < B_OK) {
 		Default();
 		return;
 	}