diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2222de12..3944ae75 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-25  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgsm/Makefile.am (TESTS): Add t-export.
+	gpgsm/t-export.c: New file.
+
 2002-06-20  Werner Koch  <wk@gnupg.org>
 
 	* gpgsm/t-sign.c (main): Also test a normal signature.
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 47307767..09ec5540 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -23,7 +23,7 @@ GPGSM = @GPGSM@
 
 TESTS_ENVIRONMENT = GNUPGHOME=.
 
-TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign
+TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
 
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der $(key_id)
 
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
new file mode 100644
index 00000000..a5f9e731
--- /dev/null
+++ b/tests/gpgsm/t-export.c
@@ -0,0 +1,91 @@
+/* t-export.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
+print_data ( GpgmeData dh )
+{
+    char buf[100];
+    size_t nread;
+    GpgmeError err;
+
+    err = gpgme_data_rewind ( dh );
+    fail_if_err (err);
+    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
+        fwrite ( buf, nread, 1, stdout );
+    }
+    if (err != GPGME_EOF) 
+        fail_if_err (err);
+}
+
+
+
+int 
+main (int argc, char **argv )
+{
+    GpgmeCtx ctx;
+    GpgmeError err;
+    GpgmeData  out;
+    GpgmeRecipients rset;
+
+  do {
+    err = gpgme_new (&ctx);
+    fail_if_err (err);
+    gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
+
+    err = gpgme_data_new ( &out );
+    fail_if_err (err);
+
+    err = gpgme_recipients_new (&rset);
+    fail_if_err (err);
+    err = gpgme_recipients_add_name (rset, "DFN Top Level Certification Authority");
+    fail_if_err (err);
+
+    gpgme_set_armor (ctx, 1 );
+    err = gpgme_op_export (ctx, rset, out );
+    fail_if_err (err);
+
+    fflush (NULL);
+    fputs ("Begin Result:\n", stdout );
+    print_data (out);
+    fputs ("End Result.\n", stdout );
+   
+    gpgme_recipients_release (rset);
+    gpgme_data_release (out);
+    gpgme_release (ctx);
+  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
+   
+    return 0;
+}
+
+