diff --git a/klogd.c b/klogd.c
index 8805ccb..278d6d7 100644
--- a/klogd.c
+++ b/klogd.c
@@ -174,6 +174,14 @@
  * Thu Aug 21 12:11:27 MET DST 1997: Martin Schulze <joey@infodrom.north.de>
  *	Fixed little mistake which prevented klogd from accepting a
  *	console log 
+ *
+ * Fri Jan  9 00:39:52 CET 1998: Martin Schulze <joey@infodrom.north.de>
+ *	Changed the behaviour of klogd when receiving a terminate
+ *	signal.  Now the program terminates immediately instead of
+ *	completing the receipt of a kernel message, i.e the read()
+ *	call.  The old behaveiour could result in klogd being
+ *	recognized as being undead, because it'll only die after a
+ *	message has been received.
  */
 
 
@@ -308,8 +316,7 @@ void stop_daemon(sig)
 	int sig;
 
 {
-	change_state = 1;
-	terminate = 1;
+	Terminate();
 	return;
 }
 
diff --git a/syslogd.c b/syslogd.c
index b0c1ac7..6648a02 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -317,7 +317,7 @@ static char sccsid[] = "@(#)syslogd.c	5.27 (Berkeley) 10/10/88";
  * Sun Jun 15 16:23:29 MET DST 1997: Michael Alan Dorman
  *	Some more glibc patches made by <mdorman@debian.org>.
  *
- * Thu Jan  1 16:04:52 CET 1998: Martin Schulze
+ * Thu Jan  1 16:04:52 CET 1998: Martin Schulze <joey@infodrom.north.de
  *	Applied patch from Herbert Thielen <Herbert.Thielen@lpr.e-technik.tu-muenchen.de>.
  *	This included some balance parentheses for emacs and a bug in
  *	the exclamation mark handling.
@@ -325,6 +325,11 @@ static char sccsid[] = "@(#)syslogd.c	5.27 (Berkeley) 10/10/88";
  *	Fixed small bug which caused syslogd to write messages to the
  *	wrong logfile under some very rare conditions.  Thanks to
  *	Herbert Xu <herbert@gondor.apana.org.au> for fiddling this out.
+ *
+ * Thu Jan  8 22:46:35 CET 1998: Martin Schulze <joey@infodrom.north.de>
+ *	Reworked one line of the above patch as it prevented syslogd
+ *	from binding the socket with the result that no messages were
+ *	forwarded to other hosts.
  */
 
 
@@ -849,7 +854,7 @@ int main(argc, argv)
 					(char *) &on, sizeof(on)) < 0 ) {
 				logerror("setsockopt, suspending inet");
 			}
-			else if (AcceptRemote) {
+			else {
 				if (bind(finet, (struct sockaddr *) &sin, \
 					 sizeof(sin)) < 0) {
 					logerror("bind, suspending inet");