diff --git a/src/ChangeLog b/src/ChangeLog
index e55ab965..0843a939 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* genkey.c (gpgme_op_genkey): Return err with TRACE_ERR.
+
 2010-05-12  Marcus Brinkmann  <marcus@g10code.de>
 
 	* conversion.c (_gpgme_timegm) [HAVE_W32_SYSTEM]: New static
diff --git a/src/genkey.c b/src/genkey.c
index aaf3e200..a85e6278 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -223,5 +223,5 @@ gpgme_op_genkey (gpgme_ctx_t ctx, const char *parms, gpgme_data_t pubkey,
   err = genkey_start (ctx, 1, parms, pubkey, seckey);
   if (!err)
     err = _gpgme_wait_one (ctx);
-  return err;
+  return TRACE_ERR (err);
 }