diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 58daccc4f..613a0abfa 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -66,7 +66,12 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 
 #ifdef AfterVendorCF
 
-# define X11ProjectRoot	/X11
+# if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+#  define X11ProjectRoot	/usr
+# else
+#  define X11ProjectRoot	/X11
+# endif
+
 # define ProjectRoot	/usr/dt
 
 #ifdef SunArchitecture
diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile
index 4ff3192a6..cd974c617 100644
--- a/cde/programs/dtsession/Imakefile
+++ b/cde/programs/dtsession/Imakefile
@@ -39,7 +39,7 @@ EXTRA_OBJS = $(ALTDIRECTORY)SmMigResources.o
 #endif
 #endif
 
-#if defined(SCOArchitecture) || defined(LinuxArchitecture)
+#if defined(SCOArchitecture)
 SYS_LIBRARIES = -lcrypt -lm
 #endif
 
@@ -67,6 +67,16 @@ DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 SYS_LIBRARIES = -lelf -lm -ldl -lgen
 #endif
 
+#if defined(LinuxArchitecture)
+EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT)
+SYS_LIBRARIES = $(XPLIB) $(XINLIB) -ldl -lcrypt -lm
+#endif
+
+#if defined(FreeBSDArchitecture)
+EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT)
+SYS_LIBRARIES = $(XPLIB) -lcrypt -lm
+#endif
+
 PROGRAMS=dtsession
 
 /**** Every .o except version.o may only be built in a remote