diff --git a/ChangeLog b/ChangeLog
index 297af745e2..32270f268f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
 	* hurd/hurd/port.h: Do not include <hurd/signal.h>.
 	* hurd/hurd/userlink.h [!defined __USE_EXTERN_INLINES ||
 	!defined _LIBC || !IS_IN (libc)]: Do not include <hurd/signal.h>.
+	* hurd/hurd/fd.h (_hurd_fd_error): Fix struct initializer to be
+	trivial, for C++ conformity.
 
 2018-03-03  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index 22dc944dce..5d51c11e6a 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -179,7 +179,7 @@ _hurd_fd_error (int fd, error_t err)
   if (signo)
     {
       const struct hurd_signal_detail detail
-	= { code: fd, error: err, exc: 0 };
+	= { exc: 0, exc_code: 0, exc_subcode: 0, code: fd, error: err };
       _hurd_raise_signal (NULL, signo, &detail);
     }
   return err;