diff --git a/ChangeLog b/ChangeLog
index 86a7230e2..8a9939889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/xfree86/common/xf86Config.c:
+	Bug #5359: Fix a segfault (Mark Kettenis)
+
 2005-12-19  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/doc/man/xorg.conf.man.pre:
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index ee05cc4d2..f4b44e67d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -489,6 +489,7 @@ fixup_video_driver_list(char **drivers)
                 }
             }
             /* if we get here, ati was already ahead of atimisc */
+            return;
         }
     }
 }