diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index ae1d7a1..68383ad 100644
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -292,6 +292,13 @@
   return str;
 }
 
+/* Find an 'intern'ed community structure */
+struct community *
+community_lookup (struct community *com)
+{
+   return (struct community *) hash_lookup (comhash, com);
+}
+
 /* Intern communities attribute.  */
 struct community *
 community_intern (struct community *com)
diff --git a/bgpd/bgp_community.h b/bgpd/bgp_community.h
index bc1e56e..78cbfe2 100644
--- a/bgpd/bgp_community.h
+++ b/bgpd/bgp_community.h
@@ -70,5 +70,6 @@
 extern void community_del_val (struct community *, u_int32_t *);
 extern unsigned long community_count (void);
 extern struct hash *community_hash (void);
+extern struct community *community_lookup (struct community *);
 
 #endif /* _QUAGGA_BGP_COMMUNITY_H */
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 81ff48d..2b05e89 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -1297,7 +1297,7 @@
 	new = community_dup (rcs->com);
       
       /* will be interned by caller if required */
-      attr->community = new;
+      attr->community = community_intern (new);
 
       attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES);
     }
@@ -1311,6 +1311,7 @@
 {
   struct rmap_com_set *rcs;
   struct community *com = NULL;
+  struct community *comint;
   char *sp;
   int additive = 0;
   int none = 0;
@@ -1337,8 +1338,9 @@
 	return NULL;
     }
   
+  comint = community_intern (com);
   rcs = XCALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (struct rmap_com_set));
-  rcs->com = com;
+  rcs->com = comint;
   rcs->additive = additive;
   rcs->none = none;
   
@@ -1401,7 +1403,7 @@
 	    }
 	  else
 	    {
-	      binfo->attr->community = new;
+	      binfo->attr->community = community_intern (new);
 	      binfo->attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES);
 	    }
 	}