diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 972f9e30..9affd166 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-26  Marcus Brinkmann  <marcus@g10code.de>
 
+	* rungpg.c (command_handler): Use _gpgme_io_write instead of write.
+
 	* edit.c (command_handler): Do not depend on PROCESSED being
 	available.
 
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index a53bac3a..66d1bda6 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -491,7 +491,7 @@ command_handler (void *opaque, int fd)
 
   /* We always need to send at least a newline character.  */
   if (!processed)
-    write (fd, "\n", 1);
+    _gpgme_io_write (fd, "\n", 1);
 
   gpg->cmd.code = 0;
   /* And sleep again until read_status will wake us up again.  */