Index: etbemon-1.4.1/doc/mon.8
===================================================================
--- etbemon-1.4.1.orig/doc/mon.8
+++ etbemon-1.4.1/doc/mon.8
@@ -255,14 +255,12 @@ host group. For example, if the watch gr
 the hostnames "smtp", "nntp", and "ns", and the monitor line reads
 as follows,
 .br
-\fC
 monitor fping.monitor \-t 4000 \-r 2
 \fR
 .br
 then the exectuable "fping.monitor" will be executed with these
 parameters:
 .br
-\fC
 MONITOR_DIR/fping.monitor \-t 4000 \-r 2 smtp nntp ns
 \fR
 .br
Index: etbemon-1.4.1/etc/init.d/mon
===================================================================
--- etbemon-1.4.1.orig/etc/init.d/mon
+++ etbemon-1.4.1/etc/init.d/mon
@@ -168,25 +168,9 @@ force_stop() {
 }
 
 
-check_directive() {
-#
-# Check directive status in /etc/default/mon
-#
-if [ $1 != "yes"  ] &&
-   [ $1 != "true" ] &&
-   [ $1 != "1"    ]
-then
-    log_failure_msg "mon is disabled, set ENABLED to \"yes\", \"true\" or \"1\" in /etc/default/mon to enable it."
-	exit 0
-fi
-}
-
-
 case "$1" in
   start)
 
-		check_directive $ENABLED
-
         log_daemon_msg "Starting $DESC " "$NAME"
         # Check if it's running first
         if running ;  then
@@ -238,8 +222,6 @@ case "$1" in
         ;;
   restart|force-reload)
 
-		check_directive $ENABLED
-
         log_daemon_msg "Restarting $DESC" "$NAME"
         errcode=0
         stop_server || errcode=$?
Index: etbemon-1.4.1/mon.d/local-syslog.monitor
===================================================================
--- etbemon-1.4.1.orig/mon.d/local-syslog.monitor
+++ etbemon-1.4.1/mon.d/local-syslog.monitor
@@ -222,7 +222,11 @@ foreach $File (@Files) {
 
   $FailureDetail{$File} = '';
 
-  open(F, $FullPath);
+  if(not open(F, $FullPath))
+  {
+    print "Can't open file \"$FullPath\"\n";
+    exit(1);
+  }
 
   if ($size > $last_size) { # Position to read new lines only
     seek(F, $last_size, 0);
Index: etbemon-1.4.1/mon.d/http_tppnp.monitor
===================================================================
--- etbemon-1.4.1.orig/mon.d/http_tppnp.monitor
+++ etbemon-1.4.1/mon.d/http_tppnp.monitor
@@ -187,7 +187,7 @@ The full path to the SmartAlarm configur
 =item B<--pipe /path/to/pipe>
 
 The full path, including file name, of the named pipe used for
-inter-process communication.  The default is /tmp/http_tppnp, the PID
+inter-process communication.  The default is /var/lib/mon/http_tppnp, the PID
 of the server process is added to this name to ensure uniqueness and
 allow multiple sets of server/clients to run simultaneously.
 
@@ -338,7 +338,7 @@ $ServerTimeout = 45 unless $ServerTimeou
 $ClientTimeout = 30 unless $ClientTimeout;
 $ResponseAlarmTime = 10000 unless $ResponseAlarmTime;
 $RandSkew = 10 unless defined $RandSkew; # Can be zero
-$NamedPipe = '/tmp/http_tppnp' unless $NamedPipe;
+$NamedPipe = '/var/lib/mon/http_tppnp' unless $NamedPipe;
 $MKFIFO = '/usr/bin/mkfifo'; # Program to make the named pipe, or FIFO
 
 my $ResponseCount = 0; # Count the responses as they are delivered
Index: etbemon-1.4.1/doc/README.syslog.monitor
===================================================================
--- etbemon-1.4.1.orig/doc/README.syslog.monitor
+++ etbemon-1.4.1/doc/README.syslog.monitor
@@ -70,8 +70,7 @@ If this should lead to global warming, c
 accept absolutely no responsibility. However, I will gladly receive and
 incoporate bugfixes and sensible bug reports.
 
-Lars Marowsky-Bre <lars@marowsky-bree.de>
-
+Lars Marowsky-Brée <lars@marowsky-bree.de>
 URL
 
 It appears we have made our way to
