diff --git a/NEWS b/NEWS
index ec9db4bd..b406c499 100644
--- a/NEWS
+++ b/NEWS
@@ -19,10 +19,13 @@
 
  * New interface gpgme_op_keylist_ext_start to search for multiple patterns.
 
+ * gpgme_key_get_ulong_attr supports the GPGME_ATTR_EXPIRE attribute.
+
  * Interface changes relative to the 0.3.3 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gpgme_op_encrypt		CHANGED: Can fail with GPGME_Invalid_Recipients
 gpgme_op_verify			EXTENDED: Accepts uninitialized text argument
+gpgme_key_get_ulong_attr	EXTENDED: Supports GPGME_ATTR_EXPIRE
 gpgme_set_include_certs		NEW
 gpgme_get_include_certs		NEW
 gpgme_op_encrypt_sign		NEW
diff --git a/TODO b/TODO
index 8970c399..0e1752c8 100644
--- a/TODO
+++ b/TODO
@@ -10,8 +10,6 @@ Hey Emacs, this is -*- outline -*- mode!
 
 * add locking to the key cache?
 
-* GpgmeKey misses GPGME_ATTR_EXPIRE attribute
-
 * Documentation
 ** Add note about GPGME clearing out pointer return values.
 ** validity/trust
@@ -38,10 +36,6 @@ Hey Emacs, this is -*- outline -*- mode!
 * Error Values
 ** Map ASSUAN/GpgSM ERR error values in a better way than is done now.
 ** Verify (and document) if Read_Error, Write_Error, Pipe_Error set errno.
-** "There is an inconsistent behaviour: if we pass three times an  
-   invalid (but non empty) passphrase, return code is GPGME_No_Data,
-   but if we pass three times an empty (and invalid) passphrase, we
-   get GPGME_No_Passphrase." Bug reported by Stephane Corthesy.
 
 * Tests
 ** Write a fake gpg-agent so that we can supply known passphrases to
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 88d4fbf9..a4c733ea 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-03  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.texi (Information About Keys): Document GPGME_ATTR_EXPIRE.
+
 2002-03-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme.texi (Verify): Document verification of normal and
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index f691e50c..fb3cbe3d 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1358,7 +1358,8 @@ This is the timestamp at creation time of a sub key.  It is
 representable as a number.
 
 @item GPGME_ATTR_EXPIRE
-XXX FIXME
+This is the expiration time of a sub key.  It is representable as a
+number.
 
 @item GPGME_ATTR_OTRUST
 XXX FIXME  (also for trust items)
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 1294c546..f2104c74 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-03  Marcus Brinkmann  <marcus@g10code.de>
+
+	* passphrase.c (_gpgme_passphrase_status_handler): Also set the
+	error No_Passphrase if only a bad passphrase was provided.
+
 2002-03-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* rungpg.c (_gpgme_gpg_op_verify): If TEXT is of mode
diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c
index f6cf48d7..6ba23baf 100644
--- a/gpgme/passphrase.c
+++ b/gpgme/passphrase.c
@@ -88,7 +88,8 @@ _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgStatusCode code, char *args)
       break;
 
     case STATUS_EOF:
-      if (ctx->result.passphrase->no_passphrase)
+      if (ctx->result.passphrase->no_passphrase
+	  || ctx->result.passphrase->bad_passphrase)
 	ctx->error = mk_error (No_Passphrase);
       break;