diff --git a/ChangeLog b/ChangeLog
index efe3bea9a..edcb7449f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
   - itojun@cvs.openbsd.org 2002/06/08 21:15:27
      [sshconnect.c]
      always use getnameinfo.  (diag message only)
+   - markus@cvs.openbsd.org 2002/06/09 04:33:27
+     [sshconnect.c]
+     abort() - > fatal()
 
 20020607
  - (bal) Removed --{enable/disable}-suid-ssh
@@ -856,4 +859,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2196 2002/06/09 20:14:54 mouring Exp $
+$Id: ChangeLog,v 1.2197 2002/06/09 20:16:22 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 9444e3cf2..369b31dfe 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.121 2002/06/08 21:15:27 itojun Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.122 2002/06/09 04:33:27 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -50,7 +50,7 @@ sockaddr_ntop(struct sockaddr *sa)
 
 	if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0,
 	    NI_NUMERICHOST) != 0)
-		abort();	/* XXX abort is bad -- do something else */
+		fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed");
 	return addrbuf;
 }