diff --git a/mozilla/extensions/spellcheck/Makefile.in b/mozilla/extensions/spellcheck/Makefile.in
index 056a9472b94..100cb0e8ab2 100644
--- a/mozilla/extensions/spellcheck/Makefile.in
+++ b/mozilla/extensions/spellcheck/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= spellchecker
-DIRS		= src idl myspell
+DIRS		= src idl myspell locales
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/extensions/spellcheck/myspell/dictionaries/Makefile.in b/mozilla/extensions/spellcheck/locales/Makefile.in
similarity index 71%
rename from mozilla/extensions/spellcheck/myspell/dictionaries/Makefile.in
rename to mozilla/extensions/spellcheck/locales/Makefile.in
index e05a21a055a..8d27de6ef30 100644
--- a/mozilla/extensions/spellcheck/myspell/dictionaries/Makefile.in
+++ b/mozilla/extensions/spellcheck/locales/Makefile.in
@@ -11,14 +11,15 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is Mozilla Spellchecker Component.
+# The Original Code is the Mozilla Browser code.
 #
 # The Initial Developer of the Original Code is
-# David Einstein.
-# Portions created by the Initial Developer are Copyright (C) 2001
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
 # the Initial Developer. All Rights Reserved.
 #
-# Contributor(s): David Einstein <Deinst@world.std.com>
+# Contributor(s):
+#   Zbigniew Braniecki <gandalf@e-gandalf.net>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -34,23 +35,24 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH          = ../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = extensions/spellcheck/locales
 
 include $(DEPTH)/config/autoconf.mk
 
+DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
 
-DICTIONARY_FILES=\
-	$(srcdir)/en-US.dic \
-	$(srcdir)/en-US.aff \
-	$(NULL)
+DICTIONARY_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/myspell/*.dic) $(wildcard $(LOCALE_SRCDIR)/myspell/*.aff))
 
+ifneq (,$(DICTIONARY_FILES))
 libs::
-	$(INSTALL) $(DICTIONARY_FILES) $(DIST)/bin/components/myspell
+        $(INSTALL)  $(DICTIONARY_FILES) $(DIST)/bin/components/myspell
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(DICTIONARY_FILES) $(DESTDIR)$(mozappdir)/components/myspell
+        $(SYSINSTALL) $(IFLAGS1) $(DICTIONARY_FILE_PREFIX) $(DESTDIR)$(mozappdir)/components/myspell
+endif
\ No newline at end of file
diff --git a/mozilla/extensions/spellcheck/myspell/dictionaries/en-US.aff b/mozilla/extensions/spellcheck/locales/en-US/myspell/en-US.aff
similarity index 100%
rename from mozilla/extensions/spellcheck/myspell/dictionaries/en-US.aff
rename to mozilla/extensions/spellcheck/locales/en-US/myspell/en-US.aff
diff --git a/mozilla/extensions/spellcheck/myspell/dictionaries/en-US.dic b/mozilla/extensions/spellcheck/locales/en-US/myspell/en-US.dic
similarity index 100%
rename from mozilla/extensions/spellcheck/myspell/dictionaries/en-US.dic
rename to mozilla/extensions/spellcheck/locales/en-US/myspell/en-US.dic
diff --git a/mozilla/extensions/spellcheck/myspell/Makefile.in b/mozilla/extensions/spellcheck/myspell/Makefile.in
index 728ae3a1ef5..57856f9dd70 100644
--- a/mozilla/extensions/spellcheck/myspell/Makefile.in
+++ b/mozilla/extensions/spellcheck/myspell/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= myspell
-DIRS		= src dictionaries
+DIRS		= src
 
 include $(topsrcdir)/config/rules.mk