diff --git a/ChangeLog b/ChangeLog
index 944d8faaad..53fedc21f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,7 @@
 
 	* hurd/hurdsig.c (_hurd_interrupted_rpc_timeout): Set to 60000.
 	* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): When the server does not
-	answer to interrupt_operation, return EIO instead of EINTR.
+	answer to interrupt_operation, return EIEIO instead of EINTR.
 	* sysdeps/mach/hurd/i386/intr-msg.h (INTR_MSG_TRAP): Make
 	_hurd_intr_rpc_msg_about_to global point to start of controlled
 	assembly snippet. Make it check canceled flag.
diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index 7ace0a16b3..9ddae627c4 100644
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -323,9 +323,9 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
       /* FALLTHROUGH */
 
     dead:
-      err = EIO;
+      err = EIEIO;
 
-      /* The EIO return indicates cancellation, so clear the flag.  */
+      /* The EIEIO return indicates cancellation, so clear the flag.  */
       ss->cancel = 0;
       break;