diff --git a/g10/ChangeLog b/g10/ChangeLog
index 01bd32f43..95dba9811 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyedit.c (sign_uids): Add additional prompt to the signature
+	level question.
+	(menu_expire): When changing expiration dates, don't replace
+	selfsigs on revoked uids since this would effectively unrevoke
+	them.  There is also no point in replacing expired selfsigs.  This
+	is bug #181.
+
+	* g10.c (main): Add --rfc2440 alias for --openpgp since in a few
+	months, they won't be the same thing.
+
 2003-06-18  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for
diff --git a/g10/g10.c b/g10/g10.c
index 0a7b9dae9..d335624a7 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -164,6 +164,7 @@ enum cmd_and_opt_values { aNull = 0,
     oLoadExtension,
     oGnuPG,
     oRFC1991,
+    oRFC2440,
     oOpenPGP,
     oPGP2,
     oPGP6,
@@ -442,6 +443,7 @@ static ARGPARSE_OPTS opts[] = {
     { oGnuPG, "no-pgp7", 0, "@"},
     { oGnuPG, "no-pgp8", 0, "@"},
     { oRFC1991, "rfc1991",   0, N_("emulate the mode described in RFC1991")},
+    { oRFC2440, "rfc2440", 0, "@" },
     { oOpenPGP, "openpgp", 0, N_("set all packet, cipher and digest options to OpenPGP behavior")},
     { oPGP2, "pgp2", 0, N_("set all packet, cipher and digest options to PGP 2.x behavior")},
     { oPGP6, "pgp6", 0, "@"},
@@ -1441,6 +1443,7 @@ main( int argc, char **argv )
 	    opt.disable_mdc = 1;
 	    opt.escape_from = 1;
 	    break;
+	  case oRFC2440:
 	  case oOpenPGP:
 	    /* TODO: When 2440bis becomes a RFC, these may need
                changing. */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 062fb992d..3f1add74e 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -649,7 +649,8 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
 
 	    while(class==0)
 	      {
-		answer = cpr_get("sign_uid.class",_("Your selection? "));
+		answer = cpr_get("sign_uid.class",_("Your selection? "
+				   "(enter '?' for more information): "));
 
 		if(answer[0]=='\0')
 		  class=0x10+opt.def_cert_check_level; /* Default */
@@ -2627,7 +2628,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
 		 && ( mainkey || sub_pk ) ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
-		&& (	(mainkey && uid && (sig->sig_class&~3) == 0x10)
+		&& ( (mainkey && uid
+		      && uid->created && (sig->sig_class&~3) == 0x10)
 		     || (!mainkey && sig->sig_class == 0x18)  ) ) {
 		/* this is a selfsignature which is to be replaced */
 		PKT_signature *newsig;