diff --git a/ChangeLog b/ChangeLog
index 47e97438b..097b08f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20030821
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/08/14 16:08:58
+     [ssh-keygen.c]
+     exit after primetest, ok djm@
+
 20030813
  - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.
  - (dtucker) OpenBSD CVS Sync
@@ -834,4 +840,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2893 2003/08/13 10:48:07 dtucker Exp $
+$Id: ChangeLog,v 1.2894 2003/08/21 06:44:07 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index a6342b183..2ce5553f6 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.107 2003/07/28 09:49:56 djm Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.108 2003/08/14 16:08:58 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -1009,6 +1009,7 @@ main(int ac, char **av)
 		}
 		if (prime_test(in, out, trials, generator_wanted) != 0)
 			fatal("modulus screening failed\n");
+		return (0);
 	}
 
 	arc4random_stir();