diff --git a/meson.build b/meson.build
index 1e676018f1..83e13648b2 100644
--- a/meson.build
+++ b/meson.build
@@ -1053,8 +1053,8 @@ endif
 isocodes = dependency('iso-codes', required: false)
 if isocodes.found()
   isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
-  isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
-  isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
+  isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
+  isocodes_localedir= isocodes_prefix / 'share' / 'locale'
 endif
 conf.set('HAVE_ISO_CODES', isocodes.found())
 
diff --git a/tools/gen-languages.c b/tools/gen-languages.c
index ac00a9d27d..570df5e14b 100644
--- a/tools/gen-languages.c
+++ b/tools/gen-languages.c
@@ -287,6 +287,7 @@ gimp_language_store_parser_init (GError **error)
 
   /* Generate the localized language names. */
   g_hash_table_iter_init (&lang_iter, l10n_lang_list);
+  gimp_bind_text_domain ("iso_639_3", ISOCODES_LOCALEDIR);
   while (g_hash_table_iter_next (&lang_iter, &key, NULL))
     {
       gchar *code           = (gchar*) key;
diff --git a/tools/meson.build b/tools/meson.build
index feb179ebf6..b65217489e 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -38,6 +38,7 @@ gen_languages = executable('gen-languages',
                            link_with: [ libgimpbase ],
                            c_args: [
                              '-DSRCDIR="@0@"'.format(meson.project_source_root()),
+                             '-DISOCODES_LOCALEDIR="@0@"'.format(isocodes_localedir),
                            ],
                            install: false)