--- embedaddon/quagga/ospfd/ospf_lsa.c	2013/07/21 23:54:40	1.1.1.3
+++ embedaddon/quagga/ospfd/ospf_lsa.c	2013/07/22 00:08:32	1.1.1.3.2.1
@@ -1624,7 +1624,8 @@ ospf_external_lsa_body_set (struct stream *s, struct e
   stream_put_ospf_metric (s, mvalue);
   
   /* Get forwarding address to nexthop if on the Connection List, else 0. */
-  fwd_addr = ospf_external_lsa_nexthop_get (ospf, ei->nexthop);
+  fwd_addr = (ei->route_map_set.nexthop.s_addr != -1) ?
+    ROUTEMAP_NEXTHOP (ei) : ospf_external_lsa_nexthop_get (ospf, ei->nexthop);
 
   /* Put forwarding address. */
   stream_put_ipv4 (s, fwd_addr.s_addr);