diff --git a/g10/ChangeLog b/g10/ChangeLog
index c8e650f80..b4f2720b3 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-02  Werner Koch  <wk@g10code.com>
+
+	* gpg.c (main): Do not allow DSA2 with a too old Libgcrypt.
+
 2008-03-26  Werner Koch  <wk@g10code.com>
 
 	* tdbio.c (lookup_hashtable): Make cmp args const.
diff --git a/g10/gpg.c b/g10/gpg.c
index 1a033ebd9..8ec3f337a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2932,6 +2932,15 @@ main (int argc, char **argv)
               "use!\n");
 #endif
 
+    /* Older Libgcrypts fail with an assertion during DSA key
+       generation.  Better disable DSA2 entirely. */
+    if (opt.flags.dsa2 && !gcry_check_version ("1.4.0") )
+      {
+        log_info ("WARNING: "
+                  "DSA2 is only available with Libgcrypt 1.4 and later\n");
+        opt.flags.dsa2 = 0;
+      }
+
     if (opt.verbose > 2)
         log_info ("using character set `%s'\n", get_native_charset ());