diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules
index deca5f53e9..b4bee9e94a 100644
--- a/build/jam/BeOSRules
+++ b/build/jam/BeOSRules
@@ -368,7 +368,8 @@ rule DoCatalogs appName	# Application name
 	genCat = [ FGristFiles $(generatedCatalog) ] ;
 	trans = [ FGristFiles $(translatedCatalogs) ] ;
 	srcs = [ FGristFiles $(sources) ] ;
-	SEARCH on $(trans) += $(SEARCH_SOURCE) ;
+	SEARCH on $(trans) += [ FDirName $(HAIKU_TOP) data catalogs $(SUBDIR_TOKENS[2-]) ] ;
+	echo [ FDirName $(HAIKU_TOP) data catalogs $(SUBDIR_TOKENS[2-]) ] ;
 
 	ExtractCatalogEntries $(genCat:S=.catkeys) : $(srcs) : $(signature) ;
 
diff --git a/src/preferences/appearance/de.catkeys b/data/catalogs/preferences/appearance/de.catkeys
similarity index 100%
rename from src/preferences/appearance/de.catkeys
rename to data/catalogs/preferences/appearance/de.catkeys
diff --git a/src/preferences/appearance/fi.catkeys b/data/catalogs/preferences/appearance/fi.catkeys
similarity index 100%
rename from src/preferences/appearance/fi.catkeys
rename to data/catalogs/preferences/appearance/fi.catkeys
diff --git a/src/preferences/appearance/fr.catkeys b/data/catalogs/preferences/appearance/fr.catkeys
similarity index 100%
rename from src/preferences/appearance/fr.catkeys
rename to data/catalogs/preferences/appearance/fr.catkeys
diff --git a/src/preferences/appearance/ja.catkeys b/data/catalogs/preferences/appearance/ja.catkeys
similarity index 100%
rename from src/preferences/appearance/ja.catkeys
rename to data/catalogs/preferences/appearance/ja.catkeys
diff --git a/src/preferences/appearance/ru.catkeys b/data/catalogs/preferences/appearance/ru.catkeys
similarity index 100%
rename from src/preferences/appearance/ru.catkeys
rename to data/catalogs/preferences/appearance/ru.catkeys
diff --git a/src/preferences/appearance/sv.catkeys b/data/catalogs/preferences/appearance/sv.catkeys
similarity index 100%
rename from src/preferences/appearance/sv.catkeys
rename to data/catalogs/preferences/appearance/sv.catkeys
diff --git a/src/preferences/bluetooth/de.catkeys b/data/catalogs/preferences/bluetooth/de.catkeys
similarity index 100%
rename from src/preferences/bluetooth/de.catkeys
rename to data/catalogs/preferences/bluetooth/de.catkeys
diff --git a/src/preferences/bluetooth/fi.catkeys b/data/catalogs/preferences/bluetooth/fi.catkeys
similarity index 100%
rename from src/preferences/bluetooth/fi.catkeys
rename to data/catalogs/preferences/bluetooth/fi.catkeys
diff --git a/src/preferences/bluetooth/fr.catkeys b/data/catalogs/preferences/bluetooth/fr.catkeys
similarity index 100%
rename from src/preferences/bluetooth/fr.catkeys
rename to data/catalogs/preferences/bluetooth/fr.catkeys
diff --git a/src/preferences/bluetooth/ru.catkeys b/data/catalogs/preferences/bluetooth/ru.catkeys
similarity index 100%
rename from src/preferences/bluetooth/ru.catkeys
rename to data/catalogs/preferences/bluetooth/ru.catkeys
diff --git a/src/preferences/bluetooth/sv.catkeys b/data/catalogs/preferences/bluetooth/sv.catkeys
similarity index 100%
rename from src/preferences/bluetooth/sv.catkeys
rename to data/catalogs/preferences/bluetooth/sv.catkeys
diff --git a/src/preferences/cpufrequency/de.catkeys b/data/catalogs/preferences/cpufrequency/de.catkeys
similarity index 100%
rename from src/preferences/cpufrequency/de.catkeys
rename to data/catalogs/preferences/cpufrequency/de.catkeys
diff --git a/src/preferences/cpufrequency/fi.catkeys b/data/catalogs/preferences/cpufrequency/fi.catkeys
similarity index 100%
rename from src/preferences/cpufrequency/fi.catkeys
rename to data/catalogs/preferences/cpufrequency/fi.catkeys
diff --git a/src/preferences/cpufrequency/fr.catkeys b/data/catalogs/preferences/cpufrequency/fr.catkeys
similarity index 100%
rename from src/preferences/cpufrequency/fr.catkeys
rename to data/catalogs/preferences/cpufrequency/fr.catkeys
diff --git a/src/preferences/cpufrequency/ru.catkeys b/data/catalogs/preferences/cpufrequency/ru.catkeys
similarity index 100%
rename from src/preferences/cpufrequency/ru.catkeys
rename to data/catalogs/preferences/cpufrequency/ru.catkeys
diff --git a/src/preferences/cpufrequency/sv.catkeys b/data/catalogs/preferences/cpufrequency/sv.catkeys
similarity index 100%
rename from src/preferences/cpufrequency/sv.catkeys
rename to data/catalogs/preferences/cpufrequency/sv.catkeys
diff --git a/src/preferences/fonts/fi.catkeys b/data/catalogs/preferences/fonts/fi.catkeys
similarity index 100%
rename from src/preferences/fonts/fi.catkeys
rename to data/catalogs/preferences/fonts/fi.catkeys
diff --git a/src/preferences/fonts/fr.catkeys b/data/catalogs/preferences/fonts/fr.catkeys
similarity index 100%
rename from src/preferences/fonts/fr.catkeys
rename to data/catalogs/preferences/fonts/fr.catkeys
diff --git a/src/preferences/fonts/ru.catkeys b/data/catalogs/preferences/fonts/ru.catkeys
similarity index 100%
rename from src/preferences/fonts/ru.catkeys
rename to data/catalogs/preferences/fonts/ru.catkeys
diff --git a/src/preferences/fonts/sv.catkeys b/data/catalogs/preferences/fonts/sv.catkeys
similarity index 100%
rename from src/preferences/fonts/sv.catkeys
rename to data/catalogs/preferences/fonts/sv.catkeys
diff --git a/src/preferences/locale/de.catkeys b/data/catalogs/preferences/locale/de.catkeys
similarity index 100%
rename from src/preferences/locale/de.catkeys
rename to data/catalogs/preferences/locale/de.catkeys
diff --git a/src/preferences/locale/fi.catkeys b/data/catalogs/preferences/locale/fi.catkeys
similarity index 100%
rename from src/preferences/locale/fi.catkeys
rename to data/catalogs/preferences/locale/fi.catkeys
diff --git a/src/preferences/locale/fr.catkeys b/data/catalogs/preferences/locale/fr.catkeys
similarity index 100%
rename from src/preferences/locale/fr.catkeys
rename to data/catalogs/preferences/locale/fr.catkeys
diff --git a/src/preferences/locale/ru.catkeys b/data/catalogs/preferences/locale/ru.catkeys
similarity index 100%
rename from src/preferences/locale/ru.catkeys
rename to data/catalogs/preferences/locale/ru.catkeys
diff --git a/src/preferences/locale/sv.catkeys b/data/catalogs/preferences/locale/sv.catkeys
similarity index 100%
rename from src/preferences/locale/sv.catkeys
rename to data/catalogs/preferences/locale/sv.catkeys