diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index 63d0ccc..275f683 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -275,7 +275,7 @@
     {
       rinfo = object;
       p.family = AF_INET;
-      p.prefix = rinfo->nexthop;
+      p.prefix = (rinfo->nexthop.s_addr) ? rinfo->nexthop : rinfo->from;
       p.prefixlen = IPV4_MAX_BITLEN;
 
       alist = access_list_lookup (AFI_IP, (char *) rule);
@@ -326,7 +326,7 @@
     {
       rinfo = object;
       p.family = AF_INET;
-      p.prefix = rinfo->nexthop;
+      p.prefix = (rinfo->nexthop.s_addr) ? rinfo->nexthop : rinfo->from;
       p.prefixlen = IPV4_MAX_BITLEN;
 
       plist = prefix_list_lookup (AFI_IP, (char *) rule);