diff --git a/cde/doc/Makefile.am b/cde/doc/Makefile.am
index 7812923ae..7b91bb241 100644
--- a/cde/doc/Makefile.am
+++ b/cde/doc/Makefile.am
@@ -21,3 +21,7 @@ endif
 if JAPANESE
 SUBDIRS += ja_JP.UTF-8
 endif
+
+install-data-hook:
+	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/man
+	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/ && $(LN_S) $(mandir) man
diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am
index 1f5f4eb9a..77bb1d60e 100644
--- a/cde/programs/Makefile.am
+++ b/cde/programs/Makefile.am
@@ -7,3 +7,7 @@ SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin		\
         dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop dtimsstart	\
         dtpdm dtsr dtpdmd dtinfo types tttypes util dtopen localized	\
         dthelp dtdocbook
+
+install-data-hook:
+	-if [ $(CDE_INSTALLATION_TOP)/bin != $(bindir) ];then \
+		cd $(DESTDIR)$(CDE_INSTALLATION_TOP) && $(LN_S) $(bindir) bin ; fi
diff --git a/cde/programs/dtopen/Makefile.am b/cde/programs/dtopen/Makefile.am
index aefee28dc..39eef4915 100644
--- a/cde/programs/dtopen/Makefile.am
+++ b/cde/programs/dtopen/Makefile.am
@@ -14,8 +14,8 @@ dtopen: dtopen.src
 	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
 install-data-hook:
-	$(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtopen_*
-	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_video
-	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_image
-	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_ps
-	cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin && $(LN_S) dtopen dtopen_pdf
+	$(RM) $(DESTDIR)$(bindir)/dtopen_*
+	cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_video
+	cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_image
+	cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_ps
+	cd $(DESTDIR)$(bindir) && $(LN_S) dtopen dtopen_pdf
diff --git a/cde/programs/dtprintegrate/Makefile.am b/cde/programs/dtprintegrate/Makefile.am
index 8ebbe5a29..de01ee113 100644
--- a/cde/programs/dtprintegrate/Makefile.am
+++ b/cde/programs/dtprintegrate/Makefile.am
@@ -4,7 +4,7 @@ bin_SCRIPTS = dtprintegrate dtlp dtlpsetup
 
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
 		-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)   \
-		-DDTKORNSHELL="$(CDE_INSTALLATION_TOP)/bin/dtksh"  \
+		-DDTKORNSHELL="$(bindir)/dtksh"  \
 		-DKORNSHELL=$(KSH)
 
 BUILT_SOURCES = dtprintegrate dtlp dtlpsetup