diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index 2ec9fbb68..613ef2172 100644
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -76,10 +76,7 @@ hookup (const char *host, int port)
 	code = -1;
 	return NULL;
     }
-    if (ai->ai_canonname != NULL)
-	strlcpy (hostnamebuf, ai->ai_canonname, sizeof(hostnamebuf));
-    else
-	strlcpy (hostnamebuf, host, sizeof(hostnamebuf));
+    strlcpy (hostnamebuf, host, sizeof(hostnamebuf));
     hostname = hostnamebuf;
 
     for (a = ai; a != NULL; a = a->ai_next) {
@@ -87,6 +84,9 @@ hookup (const char *host, int port)
 	if (s < 0)
 	    continue;
 
+	if (a->ai_canonname != NULL)
+	    strlcpy (hostnamebuf, a->ai_canonname, sizeof(hostnamebuf));
+
 	memcpy (hisctladdr, a->ai_addr, a->ai_addrlen);
 	
 	error = connect (s, a->ai_addr, a->ai_addrlen);