diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index a874048d..3154b3ac 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-18  Marcus Brinkmann  <marcus@g10code.de>
+
+	* verify.c (_gpgme_verify_status_handler): Return GPGME_No_Data
+	for NODATA status without signatures.
+
 2003-05-05  Marcus Brinkmann  <marcus@g10code.de>
 
 	* key.c (_gpgme_key_append_name): Use decoded string to parse user id.
diff --git a/gpgme/verify.c b/gpgme/verify.c
index e94232cb..946f66e2 100644
--- a/gpgme/verify.c
+++ b/gpgme/verify.c
@@ -467,6 +467,11 @@ _gpgme_verify_status_handler (void *priv, GpgmeStatusCode code, char *args)
       return sig ? parse_valid_sig (sig, args) : GPGME_General_Error;
 
     case GPGME_STATUS_NODATA:
+      if (!sig)
+	return GPGME_No_Data;
+      sig->status = GPGME_No_Data;
+      break;
+
     case GPGME_STATUS_UNEXPECTED:
       if (!sig)
 	return GPGME_General_Error;