diff -ur msgd.dist/Common/answerback.c msgd/Common/answerback.c
--- msgd.dist/Common/answerback.c	Mon Jun  1 18:24:57 1998
+++ msgd/Common/answerback.c	Fri Feb 26 20:43:19 1999
@@ -26,7 +26,7 @@
 
 
 /* We may be sending to multiple instances of the same user, so it makes
-   since to remember the last user we looked up and his/her UID to avoid
+   sense to remember the last user we looked up and his/her UID to avoid
    searching the passwd file again. */
 
 answerback( errcode, user, line )
diff -ur msgd.dist/Include/msg.h msgd/Include/msg.h
--- msgd.dist/Include/msg.h	Mon Jun  1 18:24:58 1998
+++ msgd/Include/msg.h	Fri Feb 26 20:45:39 1999
@@ -13,7 +13,15 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <utmp.h>
+#ifdef	_PATH_UTMP
+#define UTMP	_PATH_UTMP
+#else
+#ifdef	UTMP_FILE
+#define UTMP	UTMP_FILE
+#else
 #define UTMP	"/etc/utmp"	/* why isn't this in utmp.h?? */
+#endif
+#endif
 #ifdef USER_PROCESS
 #define SYSV_UTMP
 #endif
diff -ur msgd.dist/Man/Makefile msgd/Man/Makefile
--- msgd.dist/Man/Makefile	Mon Jun  1 18:24:59 1998
+++ msgd/Man/Makefile	Fri Feb 26 19:33:28 1999
@@ -13,6 +13,6 @@
 	cp -p msgd.8 $(MANDIR)/man8
 	chown $(MANUSER) $(MANDIR)/man8/msgd.8
 	chmod $(MANMODE) $(MANDIR)/man8/msgd.8
-	cp -p mesg.8 $(MANDIR)/man8
-	chown $(MANUSER) $(MANDIR)/man8/mesg.8
-	chmod $(MANMODE) $(MANDIR)/man8/mesg.8
+	cp -p mesg.1 $(MANDIR)/man1
+	chown $(MANUSER) $(MANDIR)/man1/mesg.1
+	chmod $(MANMODE) $(MANDIR)/man1/mesg.1
diff -ur msgd.dist/msg/remote.c msgd/msg/remote.c
--- msgd.dist/msg/remote.c	Mon Jun  1 18:25:02 1998
+++ msgd/msg/remote.c	Fri Feb 26 20:31:42 1999
@@ -77,7 +77,7 @@
     sock = socket( hp->h_addrtype, SOCK_STREAM, 0 );
     if (sock < 0)
 	fatal( "couldn't create socket: %s", syserr() );
-    if (connect( sock, (char *)&sin, sizeof(sin) ) < 0) {
+    if (connect( sock, &sin, sizeof(sin) ) < 0) {
 	errmsg( NO_CONNECT, desthost, syserr() );
 	(void) close(sock);
 	sock = -1;