diff --git a/ChangeLog b/ChangeLog
index 05e12ad9..48a816eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-30  Daniel Stone  <daniel@fooishbar.org>
+
+	* nls/Makefile.am:
+	Generate locale.alias and compose.dir exactly like we do in the monolith,
+	which fixes non-UTF-8 locales in particular (so we get foo: bar, as well as
+	foo bar).  Switch to generating locale.dir the same way.
+
 2005-09-21  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* x11.pc.in: 
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 6a5754a2..9233e6a7 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -1,13 +1,13 @@
 x11localedir = $(X11_LOCALEDATADIR)
 
-EXTRA_DIST = locale.alias.pre compose.dir.pre
+EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre
 
-dist_x11locale_DATA=locale.dir compose.dir
-x11locale_DATA=locale.alias
+x11locale_DATA = locale.alias locale.dir compose.dir
 
 DISTCLEANFILES= \
-	locale.alias locale.alias.l1 \
-	compose.dir compose.dir.l1 \
+	locale.alias locale.alias.l1 locale.alias.l2 \
+	compose.dir compose.dir.l1 compose.dir.l2 \
+	locale.dir locale.dir.l1 locale.dir.l2 \
 	XLC_LOCALE
 
 SUBDIRS= \
@@ -73,9 +73,17 @@ include $(top_srcdir)/cpprules.in
 locale.alias: locale.alias.pre
 	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
-        < locale.alias.l1 > locale.alias
+        < locale.alias.l1 > locale.alias.l2
+	cat locale.alias.l2 locale.alias.l1 > locale.alias
 
 compose.dir: compose.dir.pre
 	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1
 	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
-        < compose.dir.l1 > compose.dir
+        < compose.dir.l1 > compose.dir.l2
+	cat compose.dir.l2 compose.dir.l1 > compose.dir
+
+locale.dir: locale.dir.pre
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1
+	sed -e '/^[^#][^        ]*:/s/://' -e '/^[^#].*[        ].*:/d' \
+        < locale.dir.l1 > locale.dir.l2
+	cat locale.dir.l2 locale.dir.l1 > locale.dir