diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 075eb46b..a441c1ae 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-01  Marcus Brinkmann  <marcus@g10code.de>
+
+	* op-support.c (_gpgme_op_reset): Set CTX->pending after calling
+	_gpgme_engine_release, as this will reset pending to zero in the
+	event done callback on cancelled operations.
+
 2002-08-30  Marcus Brinkmann  <marcus@g10code.de>
 
 	* rungpg.c (_gpgme_gpg_op_edit): Add args from signers.
diff --git a/trunk/gpgme/op-support.c b/trunk/gpgme/op-support.c
index 125b7230..bcaf8327 100644
--- a/trunk/gpgme/op-support.c
+++ b/trunk/gpgme/op-support.c
@@ -35,13 +35,12 @@ _gpgme_op_reset (GpgmeCtx ctx, int type)
   struct GpgmeIOCbs io_cbs;
 
   fail_on_pending_request (ctx);
-  ctx->pending = 1;
-
   _gpgme_release_result (ctx);
 
   /* Create an engine object.  */
   _gpgme_engine_release (ctx->engine);
   ctx->engine = NULL;
+  ctx->pending = 1;
   err = _gpgme_engine_new (ctx->use_cms ? GPGME_PROTOCOL_CMS
 			   : GPGME_PROTOCOL_OpenPGP, &ctx->engine);
   if (err)