diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 7b47268..9e787d0 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26 Hasso Tepper <hasso at quagga.net>
+
+	* rip_routemap.c: Make "match interface" routemap command match both -
+	  in and out interfaces.
+
 2005-05-11 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* rip_interface.c (rip_interface_add): Need to call
diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index e9dae2a..63d0ccc 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -228,7 +228,7 @@
 
       rinfo = object;
 
-      if (rinfo->ifindex_out == ifp->ifindex)
+      if (rinfo->ifindex_out == ifp->ifindex || rinfo->ifindex == ifp->ifindex)
 	return RMAP_MATCH;
       else
 	return RMAP_NOMATCH;