diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8dceec23..dd6dd09a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgsm/t-genkey.c: New file (not added to Makefile.am because of
+	gpg-agent bug).
+
 2002-02-08  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgsm/Makefile.am (key_id): Update value.
diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c
new file mode 100644
index 00000000..3849f9e4
--- /dev/null
+++ b/tests/gpgsm/t-genkey.c
@@ -0,0 +1,85 @@
+/* t-genkey.c  - regression test
+ *	Copyright (C) 2000 Werner Koch (dd9jn)
+ *      Copyright (C) 2001 g10 Code GmbH
+ *
+ * This file is part of GPGME.
+ *
+ * GPGME is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GPGME is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <gpgme.h>
+
+#define fail_if_err(a) do { if(a) {                                       \
+                               fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+                                __FILE__, __LINE__, gpgme_strerror(a));   \
+                                exit (1); }                               \
+                             } while(0)
+
+
+static void
+progress ( void *self, const char *what, int type, int current, int total)
+{
+    fprintf (stderr, "progress `%s' %d %d %d\n", what, type, current, total);
+}
+
+
+int 
+main (int argc, char **argv )
+{
+    GpgmeCtx ctx;
+    GpgmeError err;
+    GpgmeData pub;
+    char *result;
+    const char *format;
+    char *parms;
+    int count = 0;
+    int len, i;
+
+  do {
+    err = gpgme_data_new (&pub);
+    err = gpgme_new (&ctx);
+    fail_if_err (err);
+    gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
+    gpgme_set_armor (ctx, 1);
+    gpgme_set_progress_cb (ctx, progress, NULL);
+ 
+    format = "<GnupgKeyParms format=\"internal\">\n"
+             "Key-Type: RSA\n"
+             "Key-Length: 1024\n"
+             "Name-DN: C=de,O=g10 code,OU=Testlab,CN=Joe %d Tester\n"
+             "Name-Email: joe@foo.bar\n"
+             "</GnupgKeyParms>\n";
+    parms = malloc ( strlen (format) + 1 + 20 );
+    if (!parms)
+        exit (8);
+    sprintf (parms, format, ++count );
+    err = gpgme_op_genkey (ctx, parms, pub, NULL );
+    fail_if_err (err);
+    free (parms);
+
+    gpgme_release (ctx);
+    result = gpgme_data_release_and_get_mem (pub, &len);
+    for (i = 0; i < len; i++)
+      printf ("%c", result[i]);
+    free (result);
+  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
+   
+    return 0;
+}