diff --git a/common/ChangeLog b/common/ChangeLog
index ac0f0ede2..d9964c1fc 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-26  Werner Koch  <wk@gnupg.org>
+
+	* maperror.c (map_to_assuan_status): Map EOF to No_Data_Available.
+
 2002-06-10  Werner Koch  <wk@gnupg.org>
 
 	* errors.h (gnupg_error_token): Add new prototype.
diff --git a/common/maperror.c b/common/maperror.c
index 0b4cc0a4d..c982965d8 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -196,6 +196,9 @@ map_to_assuan_status (int rc)
 {
   switch (rc)
     {
+    case -1:
+      rc = ASSUAN_No_Data_Available;
+      break;
     case 0: break;
     case GNUPG_Bad_CA_Certificate: 
     case GNUPG_Bad_Certificate: