diff --git a/os/access.c b/os/access.c
index 8828e0834..e7d9d2916 100644
--- a/os/access.c
+++ b/os/access.c
@@ -827,7 +827,9 @@ DefineSelf(int fd)
 
             /*
              * ignore 'localhost' entries as they're not useful
-             * on the other end of the wire
+             * on the other end of the wire and because on hosts
+             * with shared home dirs they'll result in conflicting
+             * entries in ~/.Xauthority
              */
             if (ifr->ifa_flags & IFF_LOOPBACK)
                 continue;
@@ -848,6 +850,14 @@ DefineSelf(int fd)
             else if (family == FamilyInternet6 &&
                      IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))
                 continue;
+
+      /* Ignore IPv6 link local addresses (fe80::/10), because
+       * they need a scope identifier, which we have no way
+       * of telling to the other end.
+       */
+      if (family == FamilyInternet6 &&
+         IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr))
+         continue;
 #endif
             XdmcpRegisterConnection(family, (char *) addr, len);
 #if defined(IPv6) && defined(AF_INET6)