diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -578,7 +578,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         for( String address : getChannel().call(new ListPossibleNames())) {
             try {
                 InetAddress ia = InetAddress.getByName(address);
-                if(ia.isReachable(500))
+                if(ia.isReachable(500) && ia instanceof Inet4Address)
                     return ia.getCanonicalHostName();
             } catch (IOException e) {
                 // if a given name fails to parse on this host, we get this error
reject IPv6 names. Revisit later as IPv6 should work in theory --- it's just that my limited experiment revealed that it doesn't seem to be working

git-svn-id: <URL>