deleted file mode 100644
--- a/intl/locales/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifndef MOZ_EXCLUDE_HYPHENATION_DICTIONARIES
-PATTERN_FILES = $(strip $(wildcard $(srcdir)/*/hyphenation/*.dic))
-
-ifneq (,$(PATTERN_FILES))
-libs::
-	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
-endif
-endif # MOZ_EXCLUDE_HYPHENATION_DICTIONARIES

--- a/intl/locales/moz.build
+++ b/intl/locales/moz.build
@@ -1,6 +1,48 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+locales = [
+    'af',
+    'bg',
+    'ca',
+    'cy',
+    'da',
+    'de-1901',
+    'de-1996',
+    'de-CH',
+    # 'en-US',  # en-US is renamed -- see below.
+    'eo',
+    'es',
+    'et',
+    'fi',
+    'fr',
+    'gl',
+    'hr',
+    'hsb',
+    'hu',
+    'ia',
+    'is',
+    'it',
+    'kmr',
+    'la',
+    'lt',
+    'mn',
+    'nb',
+    'nl',
+    'nn',
+    'pl',
+    'pt',
+    'ru',
+    'sh',
+    'sl',
+    'sv',
+    'tr',
+    'uk',
+]
+filename = '{locale}/hyphenation/hyph_{locale}.dic'
+FINAL_TARGET_FILES.hyphenation += [filename.format(locale=locale) for locale in locales]
+# en-US is a special case: the dic file is named like en_US.
+FINAL_TARGET_FILES.hyphenation += ['en-US/hyphenation/hyph_en_US.dic']