diff --git a/cde/configure.ac b/cde/configure.ac
index 61e342e3b..ab74b1859 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -127,7 +127,7 @@ if test "$bsd" = "yes"
 then
         SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DCSRG_BASED"
         MOTIF_LIB="-L/usr/local/lib -R/usr/local/lib"
-        MOTIF_INC="-I/usr/local/include -I/usr/X11R6/include/freetype2"
+        MOTIF_INC="-I/usr/local/include -I/usr/X11R6/include/freetype2 -I/usr/local/include/freetype2"
 fi
 
 is_x86_64=no
@@ -298,9 +298,13 @@ AC_FUNC_FORK
 
 dnl programs with full paths
 
+dnl - KSH, some systems call it as ksh93
 AC_PATH_PROG(KSH, ksh)
 if test -z "$ac_cv_path_KSH"; then
-   MISSING_PROGS="ksh ${MISSING_PROGS}"
+   AC_PATH_PROG(KSH, ksh93)
+   if test -z "$ac_cv_path_KSH"; then
+      MISSING_PROGS="[ksh or ksh93] ${MISSING_PROGS}"
+   fi
 fi
 
 AC_PATH_PROG(XRDB, xrdb)
diff --git a/cde/lib/DtWidget/Makefile.am b/cde/lib/DtWidget/Makefile.am
index 11237e8e9..0726f6ce0 100644
--- a/cde/lib/DtWidget/Makefile.am
+++ b/cde/lib/DtWidget/Makefile.am
@@ -15,11 +15,7 @@ libDtWidget_la_CFLAGS += -I/usr/include/freetype2
 endif
 
 if BSD
-libDtWidget_la_CFLAGS += -I$(x_includes)/freetype2
-endif
-
-if NETBSD
- libDtWidget_la_CFLAGS += -I$(x_includes)
+libDtWidget_la_CFLAGS += -I/usr/local/include/freetype2
 endif
 
 if SOLARIS
@@ -27,10 +23,6 @@ libDtWidget_la_CFLAGS += -DNO_REGCOMP
 libDtWidget_la_LIBADD = -lXm -lc -lw -lm -lintl
 endif
 
-if HPUX
-libDtWidget_la_CFLAGS += -DMESSAGE_CAT
-endif
-
 
 libDtWidget_la_SOURCES = ComboBox.c      Control.c       DialogBox.c \
 			 DtMsgs.c        DtStrDefs.c     EditAreaData.c \
diff --git a/cde/lib/tt/bin/ttauth/Makefile.am b/cde/lib/tt/bin/ttauth/Makefile.am
index 48b17d3b8..f88d43337 100644
--- a/cde/lib/tt/bin/ttauth/Makefile.am
+++ b/cde/lib/tt/bin/ttauth/Makefile.am
@@ -14,7 +14,7 @@ if SOLARIS
 ttauth_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
 endif
 
-if OPENBSD
+if BSD
 ttauth_LDADD += $(XTOOLLIB)
 endif
 
diff --git a/cde/lib/tt/bin/ttdbserverd/Makefile.am b/cde/lib/tt/bin/ttdbserverd/Makefile.am
index f30262bc9..087a8a3b3 100644
--- a/cde/lib/tt/bin/ttdbserverd/Makefile.am
+++ b/cde/lib/tt/bin/ttdbserverd/Makefile.am
@@ -18,7 +18,7 @@ if SOLARIS
 rpc_ttdbserver_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
 endif
 
-if OPENBSD
+if BSD
 rpc_ttdbserver_LDADD += $(XTOOLLIB)
 endif
 
diff --git a/cde/lib/tt/bin/ttsession/Makefile.am b/cde/lib/tt/bin/ttsession/Makefile.am
index ad23a7bc5..cad1b8734 100644
--- a/cde/lib/tt/bin/ttsession/Makefile.am
+++ b/cde/lib/tt/bin/ttsession/Makefile.am
@@ -16,7 +16,7 @@ if SOLARIS
 ttsession_LDADD += $(XTOOLLIB) -ldl -lintl -lsocket -lnsl
 endif
 
-if OPENBSD
+if BSD
 ttsession_LDADD += $(XTOOLLIB)
 endif
 
diff --git a/cde/programs/dtlogin/Makefile.am b/cde/programs/dtlogin/Makefile.am
index da8970252..cdb3309e2 100644
--- a/cde/programs/dtlogin/Makefile.am
+++ b/cde/programs/dtlogin/Makefile.am
@@ -65,6 +65,7 @@ endif
 if FREEBSD
 AM_CFLAGS += -DHASDES -DHASXDMAUTH
 XBINDIR = /usr/local/bin
+dtlogin_SOURCES += xdmauth.c
 endif
 
 if OPENBSD