--- ./Imakefile.orig	1996-03-14 14:02:00.000000000 +0100
+++ ./Imakefile	2014-02-28 08:07:51.884434658 +0100
@@ -147,6 +147,11 @@
          XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DECHO_N -DUSE_TERMIOS
 #endif
 
+#ifdef FreeBSDArchitecture
+        LOCAL_LDFLAGS =
+        XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DECHO_N -DUSE_TERMIOS
+#endif
+
 #if SystemV4		/* SVR4 is mostly POSIX */
 	 XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DUSE_TERMIOS
 #endif
@@ -241,27 +246,28 @@
 	sed -e 's^\"{icon dir}\"^\"$(XDTMDIR)/icons\"^' \
 	   xdtmrc.orig > xdtmrc
 	sed -e 's^iconfile^$(XDTMDIR)/new_xdtm.xbm^' Xdtm.ad.tmpl > Xdtm.ad
+	cp xdtm.sh xdtm.sh.script
 
 XCOMM Install the xdtm execute script file, used to prevent xterms closing
 XCOMM when the inferier process dies.
-InstallProgram(xdtm.sh, $(BINDIR))
+InstallScript(xdtm.sh,$(BINDIR))
 
 XCOMM Install the helpfile, system xdtmrc, icon bitmaps and the default
 XCOMM application defaults.
 
-MakeDirectories(install, $(XDTMDIR))
-InstallNonExec(help, $(XDTMDIR))
-InstallNonExec(perm.help, $(XDTMDIR))
-InstallNonExec(xdtmrc, $(XDTMDIR))
-InstallNonExec(bitmaps/new_xdtm.xbm, $(XDTMDIR))
-MakeDirectories(install, $(XDTMDIR)/icons)
+MakeDirectories(install,$(XDTMDIR))
+InstallNonExec(help,$(XDTMDIR))
+InstallNonExec(perm.help,$(XDTMDIR))
+InstallNonExec(xdtmrc,$(XDTMDIR))
+InstallNonExec(bitmaps/new_xdtm.xbm,$(XDTMDIR))
+MakeDirectories(install,$(XDTMDIR)/icons)
 InstallAppDefaults(Xdtm)
 
 install::
-	$(CP) icons$(PATHSEP)*$(PATHSEP)*.icon $(XDTMDIR)/icons
+	$(CP) icons$(PATHSEP)*$(PATHSEP)*.icon $(DESTDIR)$(XDTMDIR)/icons
 	$(RM) xdtmrc
 	$(MV) xdtmrc.orig xdtmrc
-	chmod -R a+r $(XDTMDIR)
+	chmod -R a+r $(DESTDIR)$(XDTMDIR)
 
 XCOMM Make the emacs TAGS file