diff --git a/cde/programs/dtsession/Dtsession.src b/cde/programs/dtsession/Dtsession.src
index e4f12007c..ca3bd45ff 100644
--- a/cde/programs/dtsession/Dtsession.src
+++ b/cde/programs/dtsession/Dtsession.src
@@ -23,6 +23,8 @@ XCOMM include "Dt"
 Dtsession*drawArea.background: black
 #ifdef __osf__
 Dtsession*lockLabelPixmap.imageName: DECDtlogo
+#elif __FreeBSD__
+Dtsession*lockLabelPixmap.imageName: FreeBSDDtlogo
 #else
 Dtsession*lockLabelPixmap.imageName: Dtlogo
 #endif
diff --git a/cde/programs/dtsession/SmMain.c b/cde/programs/dtsession/SmMain.c
index 5d94de318..3b65f753f 100644
--- a/cde/programs/dtsession/SmMain.c
+++ b/cde/programs/dtsession/SmMain.c
@@ -101,6 +101,9 @@ static int RegisterX11ScreenSaver(Display *display, int *ssEventType);
 #ifdef SVR4
 #define SECURE_SYS_PATH "/etc/shadow"
 #endif
+#ifdef CSRG_BASED
+#define SECURE_SYS_PATH "/etc/master.passwd"
+#endif
 
 
 
diff --git a/cde/programs/dtsession/SmScreen.c b/cde/programs/dtsession/SmScreen.c
index 7c02a7105..ece158a88 100644
--- a/cde/programs/dtsession/SmScreen.c
+++ b/cde/programs/dtsession/SmScreen.c
@@ -239,7 +239,7 @@ SmSaverParseSaverList(
    int i = 0;
    char * tmpStr;
    int len = strlen(saverList);
-   int bytes = sizeof(int);
+   int bytes = sizeof(long);
    char *p;
    SmSaverParseStruct *pstruct;