diff --git a/lib/roken/getaddrinfo.c b/lib/roken/getaddrinfo.c
index 0a6e5007a..61cb7019f 100644
--- a/lib/roken/getaddrinfo.c
+++ b/lib/roken/getaddrinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -215,26 +215,6 @@ get_null (const struct addrinfo *hints,
     return 0;
 }
 
-/*
- * Try to find a fqdn (with `.') in he if possible, else return h_name
- */
-
-static char *
-find_fqdn (const struct hostent *he)
-{
-    char *ret = he->h_name;
-    char **h;
-
-    if (strchr (ret, '.') == NULL)
-	for (h = he->h_aliases; *h; ++h) {
-	    if (strchr (*h, '.') != NULL) {
-		ret = *h;
-		break;
-	    }
-	}
-    return ret;
-}
-
 static int
 add_hostent (int port, int protocol, int socktype,
 	     struct addrinfo ***current,
@@ -248,14 +228,14 @@ add_hostent (int port, int protocol, int socktype,
     if (*flags & AI_CANONNAME) {
 	struct hostent *he2 = NULL;
 
-	canonname = find_fqdn (he);
+	canonname = hostent_find_fqdn (he);
 	if (strchr (canonname, '.') == NULL) {
 	    int error;
 
 	    he2 = getipnodebyaddr (he->h_addr_list[0], he->h_length,
 				   he->h_addrtype, &error);
 	    if (he2 != NULL) {
-		char *tmp = find_fqdn (he2);
+		char *tmp = hostent_find_fqdn (he2);
 
 		if (strchr (tmp, '.') != NULL)
 		    canonname = tmp;
diff --git a/lib/roken/getnameinfo.c b/lib/roken/getnameinfo.c
index c9c4b0a6f..e7f8e9121 100644
--- a/lib/roken/getnameinfo.c
+++ b/lib/roken/getnameinfo.c
@@ -56,7 +56,7 @@ doit (int af,
 						addrlen,
 						af);
 	    if (he != NULL) {
-		strlcpy (host, he->h_name, hostlen);
+		strlcpy (host, hostent_find_fqdn(he), hostlen);
 		if (flags & NI_NOFQDN) {
 		    char *dot = strchr (host, '.');
 		    if (dot != NULL)
diff --git a/lib/roken/hostent_find_fqdn.c b/lib/roken/hostent_find_fqdn.c
new file mode 100644
index 000000000..68d701c8e
--- /dev/null
+++ b/lib/roken/hostent_find_fqdn.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+RCSID("$Id$");
+#endif
+
+#include "roken.h"
+
+/*
+ * Try to find a fqdn (with `.') in he if possible, else return h_name
+ */
+
+char *
+hostent_find_fqdn (const struct hostent *he)
+{
+    char *ret = he->h_name;
+    char **h;
+
+    if (strchr (ret, '.') == NULL)
+	for (h = he->h_aliases; *h; ++h) {
+	    if (strchr (*h, '.') != NULL) {
+		ret = *h;
+		break;
+	    }
+	}
+    return ret;
+}