diff --git a/src/ChangeLog b/src/ChangeLog
index 1f98f943..bfda7754 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-10  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-tool.c (gpgme_server): Use special hack for Windows CE to
+	get at stdin and stdout.
+
 	* engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back
 	to child_fds.
 
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index c435d747..66720506 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -2940,8 +2940,13 @@ gpgme_server (gpgme_tool_t gt)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FIELDES in this case. */
+#ifdef HAVE_W32CE_SYSTEM
+  filedes[0] = ASSUAN_STDIN;
+  filedes[1] = ASSUAN_STDOUT;
+#else
   filedes[0] = assuan_fdopen (0);
   filedes[1] = assuan_fdopen (1);
+#endif
   err = assuan_new (&server.assuan_ctx);
   if (err)
     log_error (1, err, "can't create assuan context");