diff --git a/ChangeLog b/ChangeLog
index 73605f6a..69d7bd51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4235,6 +4235,8 @@ v0.33.19        26-Oct-2001
 		can't start the bbs from telnet anymore! With a later release
 		this may change by adding a login wrapper, for now this is how
 		it works now. Take it or leave it.
+		On FreeBSD the installed files are not removed anymore from
+		the source tree.
 		Added German language file made by Harald Wuensch.
 
 	SETUP.sh
diff --git a/html/Makefile b/html/Makefile
index 12ca5dc0..55fce7c5 100644
--- a/html/Makefile
+++ b/html/Makefile
@@ -106,14 +106,14 @@ install:
 		@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/misc
 		@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/programs
 		@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/setup
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE}    ${PREFIX}/html
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC}    ${PREFIX}/html/ftsc
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES}  ${PREFIX}/html/images
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS}   ${PREFIX}/html/menus
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC}    ${PREFIX}/html/misc
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS}   ${PREFIX}/html/programs
-		@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP}   ${PREFIX}/html/setup
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE}    ${PREFIX}/html
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC}    ${PREFIX}/html/ftsc
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES}  ${PREFIX}/html/images
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS}   ${PREFIX}/html/menus
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC}    ${PREFIX}/html/misc
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS}   ${PREFIX}/html/programs
+		@${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP}   ${PREFIX}/html/setup
 
 clean:
 		rm -f filelist
diff --git a/lang/Makefile b/lang/Makefile
index 87653ed8..73963c3f 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -14,7 +14,7 @@ clean:
 		rm -f core filelist Makefile.bak *.lang
 
 install: ${LDAT}
-		${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${ETCDIR}
+		${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${ETCDIR}
 
 english.lang:	english.txt
 		../mbsebbs/mblang english.lang english.txt
diff --git a/mbcico/Makefile b/mbcico/Makefile
index 40fd69b5..9069ae59 100644
--- a/mbcico/Makefile
+++ b/mbcico/Makefile
@@ -46,8 +46,8 @@ clean:
 		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -s -g ${GROUP} -o ${OWNER} -m 4751 mbcico ${BINDIR}
-		${INSTALL} -s -g ${GROUP} -o ${OWNER} -m 0755 mbout  ${BINDIR}
+		${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4751 mbcico ${BINDIR}
+		${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0755 mbout  ${BINDIR}
 
 mbcico:		${MBCICO_OBJS} ${LIBS}
 		${CC} -o mbcico ${MBCICO_OBJS} ${LIBS}
diff --git a/mbfido/Makefile b/mbfido/Makefile
index 235d57b0..047d2dd6 100644
--- a/mbfido/Makefile
+++ b/mbfido/Makefile
@@ -88,13 +88,13 @@ clean:
 		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 4751 mbfido  ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbseq   ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbaff   ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbindex ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbdiff  ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbfile  ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbmsg   ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4751 mbfido  ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbseq   ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbaff   ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbindex ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbdiff  ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbfile  ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbmsg   ${BINDIR}
 		rm -f ${BINDIR}/mbmail
 		ln -s ${BINDIR}/mbfido ${BINDIR}/mbmail
 		rm -f ${BINDIR}/mbnews
diff --git a/mbmon/Makefile b/mbmon/Makefile
index 7dfb89ef..7f8954c7 100644
--- a/mbmon/Makefile
+++ b/mbmon/Makefile
@@ -26,7 +26,7 @@ clean:
 		rm -f mbmon *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbmon   ${BINDIR}
+		${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbmon   ${BINDIR}
 
 filelist:	Makefile
 		BASE=`pwd`; \
diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile
index 71d42897..cad8c627 100644
--- a/mbsebbs/Makefile
+++ b/mbsebbs/Makefile
@@ -106,16 +106,16 @@ install:	all
 		@if [ "`id -un`" != "root" ] ; then \
 			echo; echo " Must be root to install!"; echo; exit 3; \
 		fi
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0751 mbsebbs   ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 6711 mbnewusr  ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mball     ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mblang    ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbchat    ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat    ${BINDIR}
-		${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR}
-		${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbuser    ${BINDIR}
-		${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR}
-		${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbpasswd  ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0751 mbsebbs   ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6711 mbnewusr  ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mball     ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mblang    ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbchat    ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat    ${BINDIR}
+		${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuser    ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbpasswd  ${BINDIR}
 		@rm -f ${BINDIR}/mbfbgen
 
 filelist:	Makefile
diff --git a/mbsebbs/mbpasswd.c b/mbsebbs/mbpasswd.c
index e1db99a4..944b5503 100644
--- a/mbsebbs/mbpasswd.c
+++ b/mbsebbs/mbpasswd.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  *
- * File ..................: mbpasswd.c
+ * $Id$
  * Purpose ...............: setuid root version of passwd
- * Last modification date : 10-Aug-2001
  * Shadow Suite (c) ......: Julianne Frances Haugh
  *
  *****************************************************************************
@@ -871,7 +870,7 @@ int main(int argc, char *argv[])
 		strcpy(temp, "/sbin/chpass");
 	else {
 		fprintf(stderr, "mbpasswd: Can't find chpass\n");
-		syslog(LOG_INFO, "Can't find chpass");
+		syslog(LOG_ERR, "Can't find chpass");
 		closelog();
 		exit(E_FAILURE);
 	}
@@ -879,14 +878,14 @@ int main(int argc, char *argv[])
 
 	if (system(cmd) != 0) {
 		perror("mbpasswd: failed to change password\n");
-		syslog(LOG_INFO, "password change for `%s' failed", name);
+		syslog(LOG_ERR, "password change for `%s' failed", name);
 		closelog();
 		exit(E_FAILURE);
 	}
 
 #endif /* __FreeBSD__ */
 
-	syslog(LOG_INFO, "password for `%s' changed by user `%s'", name, myname);
+	syslog(LOG_NOTICE, "password for `%s' changed by user `%s'", name, myname);
 	closelog();
 	exit(E_SUCCESS);
 }
diff --git a/mbsebbs/salt.c b/mbsebbs/salt.c
index 51e09214..ab09941d 100644
--- a/mbsebbs/salt.c
+++ b/mbsebbs/salt.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  *
- * File ..................: mbuseradd/salt.c
+ * $Id$
  * Purpose ...............: MBSE BBS Shadow Password Suite
- * Last modification date : 13-May-2001
  * Original Source .......: Shadow Password Suite
  * Original Copyrioght ...: Julianne Frances Haugh and others.
  *
@@ -64,9 +63,12 @@ char *crypt_make_salt(void)
 	static char result[40];
 
 	result[0] = '\0';
+
+#ifndef __FreeBSD__
 	if (getdef_bool("MD5_CRYPT_ENAB")) {
 		strcpy(result, "$1$");  /* magic for the new MD5 crypt() */
 	}
+#endif
 
 	/*
 	 * Generate 8 chars of salt, the old crypt() will use only first 2.
diff --git a/mbsetup/Makefile b/mbsetup/Makefile
index 12042495..907a1de9 100644
--- a/mbsetup/Makefile
+++ b/mbsetup/Makefile
@@ -39,7 +39,7 @@ clean:
 		rm -f mbsetup *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbsetup ${BINDIR}
+		${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbsetup ${BINDIR}
 
 filelist:	Makefile
 		BASE=`pwd`; \
diff --git a/mbtask/Makefile b/mbtask/Makefile
index 53dc91a5..3c94691d 100644
--- a/mbtask/Makefile
+++ b/mbtask/Makefile
@@ -30,7 +30,7 @@ install:	all
 		@if [ "`id -un`" != "root" ] ; then \
 			echo; echo " Must be root to install!"; echo; exit 3; \
 		fi
-		${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbtask   ${BINDIR}
+		${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbtask   ${BINDIR}
 		@if [ -f ${ETCDIR}/mbsed.conf ]; then \
 			rm ${ETCDIR}/mbsed.conf ; \
 		fi
@@ -41,8 +41,8 @@ install:	all
 			rm ${BINDIR}/mbsed ; \
 		fi
 		@if [ ! -f ${ETCDIR}/issue ]; then \
-			${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 issue  ${ETCDIR} ; \
-			echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 issue  ${ETCDIR}"; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue  ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue  ${ETCDIR}"; \
 		fi
 
 filelist:	Makefile
diff --git a/script/Makefile b/script/Makefile
index 01f1d916..c23da512 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -19,23 +19,23 @@ install:
 			echo; echo " Must be root to install!"; echo; exit 3; \
 		fi
 		@if [ ! -x ${ETCDIR}/maint ]; then \
-			${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 maint       ${ETCDIR} ; \
-			echo "${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 maint       ${ETCDIR}" ; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 maint       ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 maint       ${ETCDIR}" ; \
 		fi
 		@if [ ! -x ${ETCDIR}/midnight ]; then \
-			${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 midnight    ${ETCDIR} ; \
-			echo "${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 midnight    ${ETCDIR}" ; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 midnight    ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 midnight    ${ETCDIR}" ; \
 		fi
 		@if [ ! -x ${ETCDIR}/weekly ]; then \
-			${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 weekly      ${ETCDIR} ; \
-			echo "${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 weekly      ${ETCDIR}" ; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 weekly      ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 weekly      ${ETCDIR}" ; \
 		fi
 		@if [ ! -x ${ETCDIR}/monthly ]; then \
-			${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 monthly     ${ETCDIR} ; \
-			echo "${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0711 monthly     ${ETCDIR}" ; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 monthly     ${ETCDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0711 monthly     ${ETCDIR}" ; \
 		fi
-		${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0755 bbsdoor.sh  ${BINDIR}
-		${INSTALL} -o ${OWNER} -g ${GROUP}  -m 0755 rundoor.sh  ${BINDIR}
+		${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 bbsdoor.sh  ${BINDIR}
+		${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 rundoor.sh  ${BINDIR}
 		@bash ./installinit.sh
 
 filelist:	Makefile