diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index e9b62e922b24..27ee001221d6 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inode.c,v 1.51 2005/01/20 15:29:40 xtraeme Exp $	*/
+/*	$NetBSD: inode.c,v 1.52 2005/04/30 20:24:32 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: inode.c,v 1.51 2005/01/20 15:29:40 xtraeme Exp $");
+__RCSID("$NetBSD: inode.c,v 1.52 2005/04/30 20:24:32 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -107,7 +107,6 @@ ckinode(union dinode *dp, struct inodesc *idesc)
 				    idesc->id_number, idesc->id_number);
 				pfatal("DIRECTORY %s: CONTAINS EMPTY BLOCKS I",
 				    pathbuf);
-				abort();
 				if (reply("ADJUST LENGTH") == 1) {
 					dp = ginode(idesc->id_number);
 					DIP(dp, size) = iswap64(i *
@@ -394,10 +393,8 @@ getnextinode(ino_t inumber)
 	static union dinode *dp;
 	union dinode *ret;
 
-	if (inumber != nextino++ || inumber > lastvalidinum) {
-		abort();
+	if (inumber != nextino++ || inumber > lastvalidinum)
 		errx(EEXIT, "bad inode number %d to nextinode", inumber);
-	}
 
 	if (inumber >= lastinum) {
 		readcnt++;
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 371b97b072ca..432233e16d5d 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pass1.c,v 1.36 2005/01/20 15:29:40 xtraeme Exp $	*/
+/*	$NetBSD: pass1.c,v 1.37 2005/04/30 20:24:32 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass1.c,v 1.36 2005/01/20 15:29:40 xtraeme Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.37 2005/04/30 20:24:32 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -152,7 +152,7 @@ pass1(void)
 		if (info == NULL) {
 			pfatal("cannot alloc %u bytes for inoinfo\n",
 			    (unsigned)(sizeof(struct inostat) * inosused));
-			abort();
+			exit(EEXIT);
 		}
 		inostathead[c].il_stat = info;
 		/*
@@ -188,7 +188,7 @@ pass1(void)
 		if (info == NULL) {
 			pfatal("cannot alloc %u bytes for inoinfo\n",
 			    (unsigned)(sizeof(struct inostat) * inosused));
-			abort();
+			exit(EEXIT);
 		}
 		memmove(info, inostathead[c].il_stat, inosused * sizeof(*info));
 		free(inostathead[c].il_stat);