diff --git a/ChangeLog b/ChangeLog
index 98125f38..2f372a60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ v0.51.3		22-Mar-2003
 		were two different values for the same purpose. The removed
 		one was not used.
 		Moved doc directory from /opt/mbse/doc to /opt/mbse/share/doc.
-		Added configure test for CPU optimization flags.
+		Added configure test for CPU optimization flags. Use with
+		./configure --enable-optimize.
 
 	mbtask:
 		Signal handler for sigchld set to sig_dfl, test for Fedora.
diff --git a/config.h.in b/config.h.in
index 0744d57d..465afc8b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -182,9 +182,6 @@
 /* Define if you have the <utmpx.h> header file.  */
 #undef HAVE_UTMPX_H
 
-/* Define if you have the utmp.ut_id strcuture member */
-#undef HAVE_STRUCT_UTMP_UT_ID
-
 /* Define if you have the memcpy function.  */
 #undef HAVE_MEMCPY
 
diff --git a/configure b/configure
index 1f6555be..a151b699 100755
--- a/configure
+++ b/configure
@@ -842,6 +842,7 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-experiment     Compile experimental code
   --enable-debugging      Compile for debugging
+  --enable-optimize       Enable CPU optimize
   --enable-newbinkp       Compile New Binkp code
 
 Optional Packages:
@@ -2898,20 +2899,29 @@ else
     CFLAGS="-O3 -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 fi
 
+# Check whether --enable-optimize or --disable-optimize was given.
+if test "${enable_optimize+set}" = set; then
+  enableval="$enable_optimize"
+   optimize=$enableval
+else
+   optimize=no
+fi;
+if test "$optimize" = "yes"; then
 echo "$as_me:$LINENO: checking for cpuflags" >&5
 echo $ECHO_N "checking for cpuflags... $ECHO_C" >&6
-for cpuflagsbin in /usr/bin /usr/local/bin /usr/pkg/bin `pwd` NONE; do
+    for cpuflagsbin in /usr/bin /usr/local/bin /usr/pkg/bin `pwd` NONE; do
         if test "$cpuflagsbin" = "NONE"; then
-                echo "$as_me:$LINENO: result: unknown" >&5
+            echo "$as_me:$LINENO: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
         elif test -x $cpuflagsbin/cpuflags; then
-		CPUFLAGS=`$cpuflagsbin/cpuflags`
-                echo "$as_me:$LINENO: result: $CPUFLAGS" >&5
+	    CPUFLAGS=`$cpuflagsbin/cpuflags`
+            echo "$as_me:$LINENO: result: $CPUFLAGS" >&5
 echo "${ECHO_T}$CPUFLAGS" >&6
-		CFLAGS="$CFLAGS $CPUFLAGS"
-                break
+	    CFLAGS="$CPUFLAGS $CFLAGS"
+            break
         fi
-done
+    done
+fi
 
 # Check whether --enable-newbinkp or --disable-newbinkp was given.
 if test "${enable_newbinkp+set}" = set; then
@@ -6480,100 +6490,6 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for struct utmp.ut_id" >&5
-echo $ECHO_N "checking for struct utmp.ut_id... $ECHO_C" >&6
-if test "${ac_cv_member_struct_utmp_ut_id+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <utmp.h>
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (ac_aggr.ut_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_utmp_ut_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <utmp.h>
-
-int
-main ()
-{
-static struct utmp ac_aggr;
-if (sizeof ac_aggr.ut_id)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_member_struct_utmp_ut_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_member_struct_utmp_ut_id=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_id" >&5
-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_id" >&6
-if test $ac_cv_member_struct_utmp_ut_id = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UTMP_UT_ID 1
-_ACEOF
-
-
-fi
-
 
 
 
diff --git a/configure.in b/configure.in
index 35e07140..169b5136 100644
--- a/configure.in
+++ b/configure.in
@@ -78,21 +78,20 @@ else
     CFLAGS="-O3 -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 fi 
 
-dnl
-dnl Check if cpuflags program is installed, if so get CPU optimization flags
-dnl Currently this only works on NetBSD.
-dnl
+AC_ARG_ENABLE(optimize,   [  --enable-optimize       Enable CPU optimize], [ optimize=$enableval ], [ optimize=no ])
+if test "$optimize" = "yes"; then
 AC_MSG_CHECKING(for cpuflags)
-for cpuflagsbin in /usr/bin /usr/local/bin /usr/pkg/bin `pwd` NONE; do
+    for cpuflagsbin in /usr/bin /usr/local/bin /usr/pkg/bin `pwd` NONE; do
         if test "$cpuflagsbin" = "NONE"; then
-                AC_MSG_RESULT(unknown)
+            AC_MSG_RESULT(unknown)
         elif test -x $cpuflagsbin/cpuflags; then
-		CPUFLAGS=`$cpuflagsbin/cpuflags`
-                AC_MSG_RESULT($CPUFLAGS)
-		CFLAGS="$CFLAGS $CPUFLAGS"
-                break
+	    CPUFLAGS=`$cpuflagsbin/cpuflags`
+            AC_MSG_RESULT($CPUFLAGS)
+	    CFLAGS="$CPUFLAGS $CFLAGS"
+            break
         fi
-done
+    done
+fi
 
 AC_ARG_ENABLE(newbinkp,  [  --enable-newbinkp       Compile New Binkp code],     [ newbinkp=$enableval ], [ newbinkp=no ])
 if test "$newbinkp" = "yes"; then
@@ -237,7 +236,6 @@ AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_STAT
 AC_STRUCT_TM
-AC_CHECK_MEMBERS([struct utmp.ut_id],,,[#include <utmp.h>])
 
 dnl
 dnl Checks for library functions.
diff --git a/html/basic.html.in b/html/basic.html.in
index 3c625a60..972360c6 100644
--- a/html/basic.html.in
+++ b/html/basic.html.in
@@ -14,7 +14,7 @@
 </HEAD>
 <BODY>
 <BLOCKQUOTE>
-<div align="right"><h5>Last update 21-Jan-2004</h5></div>
+<div align="right"><h5>Last update 04-Apr-2004</h5></div>
 <div align="center"><h1>MBSE BBS Basic Installation</h1></div>
 
 <h3>Introduction.</h3>
@@ -28,12 +28,11 @@ less important packages which if missinng still let you compile MBSE BBS, but yo
 some features. Here is a short list of these packages:
 <ol>
  <li><b>Zlib</b>. On some distributions you also need <b>zlib development</b>. When you have
-     zlib installed, then in <b>mbcico</b> extra code will be compiled in the Hydra protocol driver
+     zlib installed, then in <b>mbcico</b> extra code will be compiled in the Hydra and Binkp protocol drivers
      that will allow the PLZ extension. When a connection is made with another system that also
      supports this extension (currently MBSE BBS and Radius beta versions), the files will be sent
      compressed even if they are already compressed. The increased throughput will be between 1 
-     and 10 times, that's even better then modem compression can do. Later the zlib compression will
-     also be added to binkp.</li>
+     and 10 times, that's even better then modem compression can do.</li>
 </ol>
 <P>&nbsp;<p>
 
@@ -44,7 +43,6 @@ layout looks like this:<br>
 <pre>
 /opt/mbse                      0775  Default MBSE_ROOT
 /opt/mbse/bin                  0755  Binaries
-/opt/mbse/doc                  0755  Generated sitedocs
 /opt/mbse/dutch/macro          0755  Dutch macro files
 /opt/mbse/dutch/menus          0755  Dutch menu files
 /opt/mbse/dutch/txtfiles       0755  Dutch ANSI files
@@ -66,6 +64,9 @@ layout looks like this:<br>
 /opt/mbse/log                  0775  MBSE BBS logfiles
 /opt/mbse/magic                0755  Magic filerequest names
 /opt/mbse/sema                 0777  Semafore files
+/opt/mbse/share/doc            0755  Generated sitedocs
+/opt/mbse/share/doc/html       0755  Generated html sitedocs
+/opt/mbse/share/doc/tags       0755  Generated area tags
 /opt/mbse/spanish/macro        0755  Spanish macro files
 /opt/mbse/spanish/menus        0755  Spanish menu files
 /opt/mbse/spanish/txtfiles     0755  Spanish ANSI files
@@ -82,6 +83,8 @@ layout looks like this:<br>
 /opt/mbse/var/msgs             0750  *.msgs netmail directory (not yet in use).
 /opt/mbse/var/nodelist         0750  Nodelists
 /opt/mbse/var/queue            0750  Queue for before outbound
+/opt/mbse/var/rules            0770  Echomail area rules files
+/opt/mbse/var/run              0770  Pid files of running programs
 /opt/mbse/var/ticqueue         0750  Queue for TIC files
 /opt/mbse/var/unknown          0750  Unprotected inbound directory
 </pre>
@@ -172,7 +175,7 @@ You now have the subdirectory with sources in the right place.
 Next build the binaries and install them using the following commands:
 <pre>
 cd ~/mbsebbs-@VERSION@
-./configure
+./configure [--enable-optimize]
 make
 su        <b>important, do not use "su -"</b>
 password: <em>enter root password here</em>
@@ -199,18 +202,7 @@ The first time <b>mbtask</b> is started on your system it will create a
 lot of new configuration files with default settings.
 <p>&nbsp;<p>
 
-<h3>Step 5: (RedHat) startup problems.</h3>
-<p>
-From RedHat 6.1 (not the older versions) the behaviour of the 
-<strong>su</strong> is changed. This may be true for other distributions since
-the end of 1999 and for Mandrake as well. The file <code>/etc/rc.d/init.d/mbsed</code> that is 
-created by the setup script is different then before. The new command
-is <strong>su -</strong> instead of simply <strong>su</strong>. It might be
-that other new distributions also need the extra minus sign. If that's the
-case, please let me know and tell me how I can test what version it is. 
-<p>&nbsp;<p>
-
-<h3>Step 6: Ready.</h3>
+<h3>Step 5: Ready.</h3>
 <p>
 Now you have shell scripts in ~/etc, most of them are called by cron, some
 are called during system startup and shutdown. You also have some default
diff --git a/mbfido/Makefile b/mbfido/Makefile
index bfbf708b..e45dca7a 100644
--- a/mbfido/Makefile
+++ b/mbfido/Makefile
@@ -91,9 +91,9 @@ install:	all
 		${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
+		${LN_S}  ${BINDIR}/mbfido ${BINDIR}/mbmail
 		rm -f ${BINDIR}/mbnews
-		ln -s ${BINDIR}/mbfido ${BINDIR}/mbnews
+		${LN_S}  ${BINDIR}/mbfido ${BINDIR}/mbnews
 
 filelist:	Makefile
 		BASE=`pwd`; \
diff --git a/script/Makefile b/script/Makefile
index a9277169..8787b752 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -57,10 +57,10 @@ install:
 			echo "Installing support for joe editor" ; \
 			rm -f ${JOEBIN}/bbsjoe ; \
 			rm -f ${JOEBIN}/bbsjmacs ; \
-			echo "ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjoe" ; \
-			ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjoe ; \
-			echo "ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjmacs" ; \
-			ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjmacs ; \
+			echo "${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjoe" ; \
+			${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjoe ; \
+			echo "${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjmacs" ; \
+			${LN_S} ${JOEBIN}/joe ${JOEBIN}/bbsjmacs ; \
 			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 editor      ${BINDIR} ; \
 			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 editor      ${BINDIR}" ; \
 		fi