diff --git a/common/ChangeLog b/common/ChangeLog
index 0b652f01c..8cb0f1efe 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08  Werner Koch  <wk@g10code.com>
+
+	* iobuf.c (translate_file_handle) [W32CE]: Handle rendezvous ids.
+
 2010-06-07  Werner Koch  <wk@g10code.com>
 
 	* sysutils.c [W32CE]: Finish pipe creation.
diff --git a/common/gettime.c b/common/gettime.c
index 42261f96a..658433d18 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -497,6 +497,7 @@ check_isotime (const gnupg_isotime_t atime)
 }
 
 
+/* Dump the ISO time T to the log stream without a LF.  */
 void
 dump_isotime (const gnupg_isotime_t t)
 {
diff --git a/common/iobuf.c b/common/iobuf.c
index 7360febdb..20649bda1 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -2366,7 +2366,12 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 static int
 translate_file_handle (int fd, int for_write)
 {
-#if defined(HAVE_W32_SYSTEM) && !defined (HAVE_W32CE_SYSTEM)
+#if defined (HAVE_W32CE_SYSTEM)
+  /* This is called only with one of the special filenames.  Under
+     W32CE the FD here is not a file descriptor but a rendezvous id,
+     thus we need to finish the pipe first.  */
+  fd = _assuan_w32ce_finish_pipe fd, for_write);
+#elif defined(HAVE_W32_SYSTEM)
   {
     int x;
     
diff --git a/common/sexputil.c b/common/sexputil.c
index 25ddbdd7f..736caded3 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -99,7 +99,7 @@ keygrip_from_canon_sexp (const unsigned char *key, size_t keylen,
 
 
 /* Compare two simple S-expressions like "(3:foo)".  Returns 0 if they
-   are identical or !0 if they are not.  Not that this function can't
+   are identical or !0 if they are not.  Note that this function can't
    be used for sorting. */
 int
 cmp_simple_canon_sexp (const unsigned char *a_orig,