diff --git a/common/ChangeLog b/common/ChangeLog
index 6666b5941..ee363f83e 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-20  Marcus Brinkmann  <marcus@g10code.de>
+
+	* maperror.c (map_ksba_err): Map -1.  Use gpg_err_make to set
+	the error source.
+
 2003-08-14  Timo Schulz  <twoaday@freakmail.de>
 
 	* dynload.h. New. W32 wrapper around the dynload mechanism.
diff --git a/common/maperror.c b/common/maperror.c
index 13657bece..f52a5995a 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -39,10 +39,10 @@ map_ksba_err (int err)
 {
   switch (err)
     {
-    case -1:
     case 0: 
       break;
 
+    case -1: err = GPG_ERR_EOF; break;
     case KSBA_Out_Of_Core: err = GPG_ERR_ENOMEM; break;
     case KSBA_Invalid_Value: err = GPG_ERR_INV_VALUE; break;
     case KSBA_Not_Implemented: err = GPG_ERR_NOT_IMPLEMENTED; break;
@@ -60,7 +60,7 @@ map_ksba_err (int err)
       err = GPG_ERR_GENERAL;
       break;
     }
-  return err;
+  return gpg_err_make (GPG_ERR_SOURCE_GPGSM, err);
 }