diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am
index f338b8bf6..39da9f18e 100644
--- a/cde/doc/C/guides/Makefile.am
+++ b/cde/doc/C/guides/Makefile.am
@@ -70,3 +70,9 @@ dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00	\
 
 BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
 CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
+
+# link the C version to en_US.UTF-8
+install-data-hook:
+	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/en_US.UTF-8
+	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib && $(LN_S) C en_US.UTF-8
+
diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am
index 0951c53aa..d0c4797f3 100644
--- a/cde/programs/dtinfo/DtMmdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/Makefile.am
@@ -29,6 +29,6 @@ libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \
 libDtMmdb_la_LDFLAGS = -version-info 2:1:0
 
 infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
-infolib_DATA = oliasdb/mmdb.infolib.spec	\
+dist_infolib_DATA = oliasdb/mmdb.infolib.spec	\
 	StyleSheet/hardcopy.feature.spec	\
 	StyleSheet/online.feature.spec
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
index 436f1c46e..fdc97de6a 100644
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
@@ -2,8 +2,6 @@ infolibdir = ${prefix}/infolib
 
 MAINTAINERCLEANFILES = Makefile.in
 
-infolib_DATA = mmdb.infolib.spec
-
 noinst_LTLIBRARIES = liboliasdb.la
 
 liboliasdb_la_CXXFLAGS = -DC_API -DNO_DB_LOCK -DCDE_NEXT -I.. -I../misc \
diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
index b19afee3e..9ad8f0126 100644
--- a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
+++ b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am
@@ -1,6 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_PROGRAMS = dtinfo_start
+startinstdir = $(CDE_INSTALLATION_TOP)/infolib/etc
+startinst_PROGRAMS = dtinfo_start
 
 BUILT_SOURCES = dtinfo_start.opnums
 
diff --git a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
index bde9efe87..ad68f1716 100644
--- a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
+++ b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am
@@ -5,4 +5,4 @@ etcdir = $(CDE_CONFIGURATION_TOP)
 SUBDIRS = bitmaps fonts
 
 infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc
-infolib_DATA = mmdb.mark.spec
+dist_infolib_DATA = mmdb.mark.spec