--- ./support/export/hostname.c.orig
+++ ./support/export/hostname.c
@@ -101,6 +101,7 @@
 		.ai_protocol	= (int)IPPROTO_UDP,
 		.ai_flags	= AI_NUMERICHOST,
 		.ai_family	= AF_UNSPEC,
+		.ai_socktype    = 0,
 	};
 	struct sockaddr_in sin;
 	int error, inet4;
@@ -348,7 +349,9 @@
 
 	/*
 	 * getaddrinfo(AI_NUMERICHOST) never fills in ai_canonname
+	 * ... well it does on __UCLIBC__
 	 */
+#ifndef __UCLIBC__
 	if (ai != NULL) {
 		free(ai->ai_canonname);		/* just in case */
 		ai->ai_canonname = strdup(buf);
@@ -357,6 +360,7 @@
 			ai = NULL;
 		}
 	}
+#endif
 
 	return ai;
 }