diff --git a/ChangeLog b/ChangeLog
index 0c45e9a852..fee6c0fd2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-02-15  Joseph Myers  <joseph@codesourcery.com>
 
+	* sunrpc/tst-svc_register.c (rpcbind_address): Remove qualifier
+	from function return type.
+
 	* setjmp/tst-setjmp.c (jump): Use __attribute__ ((__noreturn__)).
 
 2019-02-14  Jan Kratochvil <jan.kratochvil@redhat.com>
diff --git a/sunrpc/tst-svc_register.c b/sunrpc/tst-svc_register.c
index 7590121e5c..73f8db2fa1 100644
--- a/sunrpc/tst-svc_register.c
+++ b/sunrpc/tst-svc_register.c
@@ -54,7 +54,7 @@ server_dispatch (struct svc_req *request, SVCXPRT *transport)
 }
 
 /* The port on which rpcbind listens for incoming requests.  */
-static inline const struct sockaddr_in
+static inline struct sockaddr_in
 rpcbind_address (void)
 {
   return (struct sockaddr_in)