diff --git a/.gitattributes b/.gitattributes
index 2f56cb00be0a4703b49ba346bcea68c75df9ca37..2476d55cc8a384b8f60c6b7a3196e57da64c846c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -609,7 +609,6 @@ testfont binary
 /src/modules/SANE/sane.c foreign_ident
 /src/modules/Yp/Makefile.in foreign_ident
 /src/modules/Yp/acconfig.h foreign_ident
-/src/modules/Yp/configure.in foreign_ident
 /src/modules/Yp/module.pmod.in foreign_ident
 /src/modules/Yp/yp.c foreign_ident
 /src/modules/_Charset/Makefile.in foreign_ident
diff --git a/src/modules/Yp/configure.in b/src/modules/Yp/configure.in
index f8e430d64e0a7f978ad85751bfb0cc1e104f6c00..8da8ea161c9f185637f7f44e70495c03bfc24c04 100644
--- a/src/modules/Yp/configure.in
+++ b/src/modules/Yp/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.13 2005/06/16 20:51:56 grubba Exp $
+# $$
 AC_INIT(yp.c)
 AC_CONFIG_HEADER(config.h)
 
@@ -6,6 +6,9 @@ AC_MODULE_INIT()
 
 AC_CHECK_LIB(nsl, gethostbyname)
 
+# Glibc 2.26 and later don't include the Sun RPC implementation anymore.
+PIKE_PKG_CONFIG(libtirpc)
+
 AC_HAVE_HEADERS(sys/types.h rpc/types.h rpc/rpc.h rpc/clnt.h \
 		rpcsvc/ypclnt.h rpcsvc/yp_prot.h,,,[
 #ifdef HAVE_RPC_TYPES_H