diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 26614ce..548fd4d 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-23 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_regex.c: (bgp_regcomp) Pass NOSUB flag to regcomp to
+	  prevent parsing of substitutions, which can have profound
+	  performance effects on bgpd and are of no use to the CLI
+	  anyway. How much it helps depends on the regex
+	  implementation.
+
 2007-07-31 Paul Jakma <paul.jakma@sun.com>
 
 	* (general) Support for draft-ietf-idr-as-pathlimit-03.
diff --git a/bgpd/bgp_regex.c b/bgpd/bgp_regex.c
index be84d40..9b65f7c 100644
--- a/bgpd/bgp_regex.c
+++ b/bgpd/bgp_regex.c
@@ -66,7 +66,7 @@
 
   regex = XMALLOC (MTYPE_BGP_REGEXP, sizeof (regex_t));
 
-  ret = regcomp (regex, magic_str, REG_EXTENDED);
+  ret = regcomp (regex, magic_str, REG_EXTENDED|REG_NOSUB);
 
   XFREE (MTYPE_TMP, magic_str);