diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index f66857c..93dc8c3 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-24 Hasso Tepper <hasso at quagga.net>
+
+	* bgp_route.c: Fix showstopper bug. New route must be selected also
+	  if old one is flaged as BGP_INFO_ATTR_CHANGED.
+
 2005-01-17 Hasso Tepper <hasso at quagga.net>
 
 	* bgp_route.c: Clear peer's routing table regardless whether it's
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 16fcc89..849cc44 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1097,7 +1097,8 @@
 	new_select = ri;
     }
 
-    if ( (! old_select) || old_select != new_select)
+    if ( (! old_select) || old_select != new_select
+	|| CHECK_FLAG (old_select->flags, BGP_INFO_ATTR_CHANGED))
 	{
   if (old_select)
     UNSET_FLAG (old_select->flags, BGP_INFO_SELECTED);