diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 1eaea4e..2118982 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-01 rivo nurges <rix@estpak.ee>
+ 
+        * bgp_route.c: fix UNH IOL BGP-4.1.12f
+ 
 2004-05-01 Paul Jakma <paul@dishone.st>
 
 	* Revert the attempted clean-up of the dummy peer hack, reverts
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 32227cb..97636ef 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -480,6 +480,16 @@
   if (from == peer)
     return 0;
 
+  /* If peer's id and route's nexthop are same. draft-ietf-idr-bgp4-23 5.1.3 */
+  if (p->family == AF_INET
+      && IPV4_ADDR_SAME(&peer->remote_id, &ri->attr->nexthop))
+    return 0;
+#ifdef HAVE_IPV6
+  if (p->family == AF_INET6
+     && IPV6_ADDR_SAME(&peer->remote_id, &ri->attr->nexthop))
+    return 0;
+#endif
+
   /* Aggregate-address suppress check. */
   if (ri->suppress)
     if (! UNSUPPRESS_MAP_NAME (filter))