diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3f4b95893..11b521d79 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-03  David Shaw  <dshaw@jabberwocky.com>
 
+	* keyedit.c (sign_uids): Nonrevocable key signatures cause an
+	automatic promotion to v4.
+
 	* exec.c: Provide stubs for exec_ functions when NO_EXEC is
 	defined.
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index b2c61a1d2..775d8edbf 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -283,9 +283,12 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
       for(node=keyblock;node;node=node->next)
 	if(node->pkt->pkttype==PKT_SIGNATURE &&
 	   node->pkt->pkt.signature->version>3)
-	  all_v3=0;
+	  {
+	    all_v3=0;
+	    break;
+	  }
 
-    if(local || opt.cert_policy_url || opt.cert_notation_data)
+    if(local || nonrevocable || opt.cert_policy_url || opt.cert_notation_data)
       force_v4=1;
 
     /* build a list of all signators.