diff --git a/SETUP.sh b/SETUP.sh
index 18cdd87c..1cb8e20d 100644
--- a/SETUP.sh
+++ b/SETUP.sh
@@ -232,7 +232,7 @@ if [ "$OSTYPE" = "Linux" ]; then
     useradd -c "MBSE BBS Admin" -d $MHOME -g bbs -G uucp -m -s /bin/bash mbse
 fi
 if [ "$OSTYPE" = "FreeBSD" ]; then
-    pw useradd mbse -c "MBSE BBS Admin" -d $MHOME -g bbs -G dialer -m -s /usr/local/bin/bash
+    pw useradd mbse -c "MBSE BBS Admin" -d $MHOME -g bbs -G wheel,dialer -m -s /usr/local/bin/bash
 fi
 log "+" "[$?] Added user mbse"
 chmod 770 $MHOME
diff --git a/mbcico/ulock.c b/mbcico/ulock.c
index 06f2e5b1..fc492f5a 100644
--- a/mbcico/ulock.c
+++ b/mbcico/ulock.c
@@ -1,11 +1,10 @@
 /*****************************************************************************
  *
- * File ..................: mbcico/ulock.c
+ * $Id$
  * Purpose ...............: Fidonet mailer
- * Last modification date : 18-Dec-1999
  *
  *****************************************************************************
- * Copyright (C) 1997-1999
+ * Copyright (C) 1997-2001
  *   
  * Michiel Broek		FIDO:	2:280/2802
  * Beekmansbos 10
@@ -33,8 +32,12 @@
 #include "../lib/clcomm.h"
 
 #ifndef LOCKDIR
+#ifdef __FreeBSD__
+#define LOCKDIR "/var/spool/lock"
+#else
 #define LOCKDIR "/var/lock"
 #endif
+#endif
 
 #define LCKPREFIX LOCKDIR"/LCK.."
 #define LCKTMP LOCKDIR"/TMP."
diff --git a/mbfido/paths.h.in b/mbfido/paths.h.in
index 46ab79c9..b0c77cc0 100644
--- a/mbfido/paths.h.in
+++ b/mbfido/paths.h.in
@@ -1,7 +1,8 @@
 /* 
-    Autogenerated by configure 
+ *  $Id$
+ *
+ *  Autogenerated by configure 
  */
 #define _PATH_COMPRESS  "@COMPRESS@"
 #define _PATH_GZIP      "@GZIP@"
 
-
diff --git a/script/installinit.sh b/script/installinit.sh
index 2d35b6c5..b5bdb0ff 100644
--- a/script/installinit.sh
+++ b/script/installinit.sh
@@ -1,8 +1,8 @@
 #
+# $Id$
+#
 # Installation script to install bootscripts.
 #
-# (C) Michiel Broek, v0.24 25-Oct-2001
-#
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:$MBSE_ROOT/bin
 DISTNAME=
 DISTVERS=
@@ -582,16 +582,25 @@ if [ "$DISTNAME" = "FreeBSD" ]; then
     DISTINIT="$MBSE_ROOT/etc/rc"
     echo "Adding FreeBSD style MBSE BBS start/stop scripts"
     log "+" "Adding FreeBSD style MBSE BBS start/stop scripts"
-    if [ "`grep MBSE /etc/rc.local`" = "" ]; then
-        log "+" "Adding $MBSE_ROOT/etc/rc to /etc/rc.local"
-        mv /etc/rc.local /etc/rc.local.mbse
-        cat /etc/rc.local.mbse >/etc/rc.local
-        echo "# Start MBSE BBS" >>/etc/rc.local
-        echo "$MBSE_ROOT/etc/rc" >>/etc/rc.local
-        chmod 644 /etc/rc.local
-        echo "   Added $MBSE_ROOT/etc/rc to /etc/rc.local"
-        echo "   /etc/rc.local.mbse is a backup file."
-        echo ""
+    if [ -f /etc/rc.local ]; then
+	if [ "`grep MBSE /etc/rc.local`" = "" ]; then
+	    log "+" "Adding $MBSE_ROOT/etc/rc to existing /etc/rc.local"
+	    mv /etc/rc.local /etc/rc.local.mbse
+	    cat /etc/rc.local.mbse >/etc/rc.local
+	    echo "# Start MBSE BBS" >>/etc/rc.local
+	    echo "$MBSE_ROOT/etc/rc" >>/etc/rc.local
+	    chmod 644 /etc/rc.local
+	    echo "   Added $MBSE_ROOT/etc/rc to /etc/rc.local"
+	    echo "   /etc/rc.local.mbse is a backup file."
+	    echo ""
+	fi
+    else
+	log "+" "Adding $MBSE_ROOT/etc/rc to new /etc/rc.local"
+	echo "# Start MBSE BBS" >/etc/rc.local
+	echo "$MBSE_ROOT/etc/rc" >>/etc/rc.local
+	chmod 644 /etc/rc.local
+	echo "   Added $MBSE_ROOT/etc/rc to /etc/rc.local"
+	echo ""
     fi
     cp mbse.start   $MBSE_ROOT/bin
     cp mbse.stop    $MBSE_ROOT/bin