diff --git a/NEWS b/NEWS
index df00d509..aecaa725 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,18 @@ Version 3.0-alpha0 (2022-02-07)
   o Bugfixes and improvements as they came along
 
 
+Version 2.15 (2024-03-10)
+  o BGP: Send hold timer
+  o BGP: New options to specify required BGP capabilities
+  o BFD: Improvements to 'show bfd sessions' command
+  o RPKI: New 'local address' configuration option
+  o Linux: Support for more route attributes, including
+    TCP congestion control algorithm
+  o Support for UDP logging
+  o Static routes can have both nexthop and interface specified
+  o Completion of command options in BIRD client
+  o Many bugfixes and improvements
+
 Version 2.14 (2023-10-06)
   o MPLS subsystem
   o L3VPN: BGP/MPLS VPNs (RFC 4364)
diff --git a/proto/aggregator/config.Y b/proto/aggregator/config.Y
index 2bf2d9b8..6185eb77 100644
--- a/proto/aggregator/config.Y
+++ b/proto/aggregator/config.Y
@@ -19,7 +19,7 @@ CF_DEFINES
 
 CF_DECLS
 
-CF_KEYWORDS(AGGREGATOR, AGGREGATE, ON, MERGE, BY)
+CF_KEYWORDS(AGGREGATOR, PEER, AGGREGATE, ON, MERGE, BY)
 
 %type <xp> aggr_item aggr_list
 
diff --git a/proto/babel/config.Y b/proto/babel/config.Y
index 28bf8027..6a7c071f 100644
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@ -26,7 +26,7 @@ CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
 	TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 	NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS,
 	ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE,
-	EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS)
+	EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS, COST, DELAY)
 
 CF_GRAMMAR
 
diff --git a/proto/static/config.Y b/proto/static/config.Y
index f8c1e76d..ef5fb94d 100644
--- a/proto/static/config.Y
+++ b/proto/static/config.Y
@@ -45,7 +45,7 @@ static_route_finish(void)
 
 CF_DECLS
 
-CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE, CHECK, LINK)
+CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE, CHECK, LINK, DEV)
 CF_KEYWORDS(ONLINK, WEIGHT, RECURSIVE, IGP, TABLE, BLACKHOLE, UNREACHABLE, BFD, MPLS)