diff --git a/src/network/getservbyname_r.c b/src/network/getservbyname_r.c
index 5c025150cb628cb4fb7299bbac86b287eb639fe1..efa5d9101a37eb2bd20296f1db7d21df9ddfeaed 100644
--- a/src/network/getservbyname_r.c
+++ b/src/network/getservbyname_r.c
@@ -12,6 +12,10 @@ int getservbyname_r(const char *name, const char *prots,
 	struct addrinfo *ai, hint = { .ai_family = AF_INET };
 	int i;
 
+	if (!prots) return -(
+		getservbyname_r(name, "tcp", se, buf, buflen, res)
+		&& getservbyname_r(name, "udp", se, buf, buflen, res) );
+
 	/* Align buffer */
 	i = (uintptr_t)buf & sizeof(char *)-1;
 	if (!i) i = sizeof(char *);
diff --git a/src/network/getservbyport_r.c b/src/network/getservbyport_r.c
index f119abc8d17fb8ed1503413ed1b0e3badc99555f..821afae9a20d72366e2cb9e8ce8ae4c5a78079d0 100644
--- a/src/network/getservbyport_r.c
+++ b/src/network/getservbyport_r.c
@@ -15,6 +15,10 @@ int getservbyport_r(int port, const char *prots,
 		.sin_port = port,
 	};
 
+	if (!prots) return -(
+		getservbyport_r(port, "tcp", se, buf, buflen, res)
+		&& getservbyport_r(port, "udp", se, buf, buflen, res) );
+
 	/* Align buffer */
 	i = (uintptr_t)buf & sizeof(char *)-1;
 	if (!i) i = sizeof(char *);