diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index d77adcf5..880ec6bc 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-16  Marcus Brinkmann  <marcus@g10code.de>
+
+	* rungpg.c (gpg_edit): Don't add a key argument if in card edit
+	mode.
+
 2005-10-06  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (gpgme.dll gpgme.dll.a): Use $(srcdir) for
diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 33c46eda..44db825d 100644
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/gpgme/rungpg.c
@@ -1356,7 +1356,7 @@ gpg_edit (void *engine, int type, gpgme_key_t key, gpgme_data_t out,
     err = add_data (gpg, out, 1, 1);
   if (!err)
     err = add_arg (gpg, "--");
-  if (!err)
+  if (!err && type == 0)
     {
       const char *s = key->subkeys ? key->subkeys->fpr : NULL;
       if (!s)