diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index c0d312066..fedc31a26 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-10  Werner Koch  <wk@gnupg.org>
+
+	* primegen.c (gen_prime): Bail out if we try to generate a prime
+	with less than 16 bits. Include i18n.h.
+
 2003-10-06  Werner Koch  <wk@gnupg.org>
 
 	* primegen.c (gen_prime): Bail out if NBITS is zero.  This is
diff --git a/cipher/primegen.c b/cipher/primegen.c
index f7e97108a..22b9bc455 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "mpi.h"
 #include "cipher.h"
+#include "i18n.h"
 
 static int no_of_small_prime_numbers;
 static MPI gen_prime( unsigned	nbits, int mode, int randomlevel );
@@ -116,7 +117,8 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
 	;
     n--;
     if( !n || (mode==1 && n < 2) )
-	log_fatal("can't gen prime with pbits=%u qbits=%u\n", pbits, qbits );
+	log_fatal(_("can't gen prime with pbits=%u qbits=%u\n"),
+                  pbits, qbits );
     if( mode == 1 ) {
 	n--;
 	fbits = (pbits - 2*req_qbits -1) / n;
@@ -304,8 +306,11 @@ gen_prime( unsigned int nbits, int secret, int randomlevel )
     if( 0 && DBG_CIPHER )
 	log_debug("generate a prime of %u bits ", nbits );
 
-    if (!nbits)
-      log_fatal ("trying to generate a prime of zero bits\n");
+    if (nbits < 16)
+      {
+        log_error (_("can't generate a prime with less than %d bits\n"), 16);
+        exit (2);
+      }
 
     if( !no_of_small_prime_numbers ) {
 	for(i=0; small_prime_numbers[i]; i++ )
diff --git a/g10/g10.c b/g10/g10.c
index db8e7d20e..34c8076f6 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -646,7 +646,7 @@ static ARGPARSE_OPTS opts[] = {
     { oReaderPort, "reader-port",    2, "@"},
     { octapiDriver, "ctapi-driver",  2, "@"},
     { opcscDriver, "pcsc-driver",    2, "@"},
-    { oDisableCCID, "disable-ccidc", 0, "@"},
+    { oDisableCCID, "disable-ccid", 0, "@"},
 
 
 {0} };
diff --git a/po/ChangeLog b/po/ChangeLog
index 0a969c192..deac7ae62 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-10  Werner Koch  <wk@gnupg.org>
+
+	* POTFILES.in (cipher/primegen.c): Added.
+
 2003-05-26  David Shaw  <dshaw@jabberwocky.com>
 
 	* POTFILES.in: Added a couple of missing source files.  Noted by
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65c26c52d..33028b5de 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,6 +13,7 @@ cipher/random.c
 cipher/rndlinux.c
 cipher/md.c
 cipher/rndegd.c
+cipher/primegen.c
 
 # main program
 g10/g10.c