diff --git a/cde/programs/fontaliases/bdf/Makefile.am b/cde/programs/fontaliases/bdf/Makefile.am
index a6aeb1881..30ec3a6f4 100644
--- a/cde/programs/fontaliases/bdf/Makefile.am
+++ b/cde/programs/fontaliases/bdf/Makefile.am
@@ -1,8 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = $(DTINFO_FONT)
-
 DTINFO_FONT = dtinfo.pcf.gz
+noinst_DATA = $(DTINFO_FONT)
 
 BUILT_SOURCES = $(DTINFO_FONT)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/cde/programs/fontaliases/bdf/fonts.inc b/cde/programs/fontaliases/bdf/fonts.am
similarity index 52%
rename from cde/programs/fontaliases/bdf/fonts.inc
rename to cde/programs/fontaliases/bdf/fonts.am
index 630df8dea..6b2415052 100644
--- a/cde/programs/fontaliases/bdf/fonts.inc
+++ b/cde/programs/fontaliases/bdf/fonts.am
@@ -1,5 +1,10 @@
 # to be included by OS/LANG/Makefile.am's
 
+BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
+CLEANFILES = $(BUILT_SOURCES)
+
+fontdir = $(CDE_INSTALLATION_TOP)/config/xfonts/$(LANG)
+dist_font_DATA = $(BUILT_SOURCES) fonts.alias
 
 dtinfo.pcf.gz: $(top_builddir)/programs/fontaliases/bdf/dtinfo.pcf.gz
 	$(RM) $@
diff --git a/cde/programs/fontaliases/freebsd/C/Makefile.am b/cde/programs/fontaliases/freebsd/C/Makefile.am
index 04d85e6c7..4f27e1447 100644
--- a/cde/programs/fontaliases/freebsd/C/Makefile.am
+++ b/cde/programs/fontaliases/freebsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/fontaliases/linux/C/Makefile.am b/cde/programs/fontaliases/linux/C/Makefile.am
index 04d85e6c7..4f27e1447 100644
--- a/cde/programs/fontaliases/linux/C/Makefile.am
+++ b/cde/programs/fontaliases/linux/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
index 04d85e6c7..74092a2f6 100644
--- a/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
+++ b/cde/programs/fontaliases/linux/en_US.UTF-8/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/English.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/fontaliases/netbsd/C/Makefile.am b/cde/programs/fontaliases/netbsd/C/Makefile.am
index 04d85e6c7..4f27e1447 100644
--- a/cde/programs/fontaliases/netbsd/C/Makefile.am
+++ b/cde/programs/fontaliases/netbsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/fontaliases/openbsd/C/Makefile.am b/cde/programs/fontaliases/openbsd/C/Makefile.am
index 04d85e6c7..4f27e1447 100644
--- a/cde/programs/fontaliases/openbsd/C/Makefile.am
+++ b/cde/programs/fontaliases/openbsd/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/fontaliases/sun/C/Makefile.am b/cde/programs/fontaliases/sun/C/Makefile.am
index 04d85e6c7..4f27e1447 100644
--- a/cde/programs/fontaliases/sun/C/Makefile.am
+++ b/cde/programs/fontaliases/sun/C/Makefile.am
@@ -1,8 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_DATA = fonts.dir
+include ../../../localized/templates/C.am
+include ../../bdf/fonts.am
 
-BUILT_SOURCES = fonts.dir dtinfo.pcf.gz
-CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_builddir)/programs/fontaliases/bdf/fonts.inc
diff --git a/cde/programs/localized/templates/English.am b/cde/programs/localized/templates/English.am
new file mode 100644
index 000000000..ce033ddbb
--- /dev/null
+++ b/cde/programs/localized/templates/English.am
@@ -0,0 +1,5 @@
+#  This file is a template for setting the platform-specific LANG
+#  variable for the C locale.
+
+LANG=en_US.UTF-8
+SOURCE_LANG=en_US.UTF-8