diff --git a/ChangeLog b/ChangeLog
index 0fb4ebdfb4..2a7abbc8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-08  Florian Weimer  <fweimer@redhat.com>
+
+	* sunrpc/key_call.c (key_call_keyenvoy): Use int status instead of
+	union wait.  Report any non-zero exit status as error.
+
 2016-03-07  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* posix/tst-execvpe5.c (do_test): Fix fix test invocation when
diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index 7ecf6fbaa1..a0d9a2a0d1 100644
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -304,7 +304,7 @@ key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg,
   FILE *fargs;
   FILE *frslt;
   sigset_t oldmask, mask;
-  union wait status;
+  int status;
   int pid;
   int success;
   uid_t ruid;
@@ -362,7 +362,7 @@ key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg,
 	success = 0;
     }
   else
-    if (status.w_retcode)
+    if (status != 0)
       {
 	debug ("wait4 1");
 	success = 0;