diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 8259a37e..d7444889 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-29  Marcus Brinkmann  <marcus@g10code.de>
+
+	* rungpg.c (_gpgme_gpg_op_edit): Use --with-colons.
+
 2002-07-28  Marcus Brinkmann  <marcus@g10code.de>
 
 	* data.c (gpgme_data_read): For GPGME_DATA_TYPE_NONE, return EOF
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index b3b9ca04..bf5e48b6 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1452,6 +1452,8 @@ _gpgme_gpg_op_edit (GpgObject gpg, GpgmeKey key, GpgmeData out)
 {
   GpgmeError err;
 
+  err = _gpgme_gpg_add_arg (gpg, "--with-colons");
+  if (!err)
   err = _gpgme_gpg_add_arg (gpg, "--edit-key");
   if (!err)
     err = _gpgme_gpg_add_data (gpg, out, 1);