diff --git a/ChangeLog b/ChangeLog
index 4c2c613c6..efd3d24a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
 	* mi/miinitext.c:
 	Bug #5525: Build a working Xprt.  (Drew Parsons)
 
+	* os/access.c:
+	Bug #5218: Don't crash on unconfigured interfaces.  (Andrei Barbu)
+
 2006-01-06  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/loader/misym.c:
diff --git a/os/access.c b/os/access.c
index 80430fb3d..8b7392e59 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,5 +1,5 @@
 /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.9 2005/05/02 22:01:08 harold Exp $ */
+/* $XdotOrg: xserver/xorg/os/access.c,v 1.13 2005/11/08 06:33:30 jkj Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -975,6 +975,8 @@ DefineSelf (int fd)
 	return;
     }
     for (ifr = ifap; ifr != NULL; ifr = ifr->ifa_next) {
+        if (!ifr->ifa_addr)
+            continue;
 #ifdef DNETCONN
 	if (ifr->ifa_addr.sa_family == AF_DECnet) 
 	    continue;