From da276639bdfb18417d705c8fb59c7f7c5148eae0 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Fri, 26 Dec 2025 14:41:15 +0100
Subject: [PATCH] NEWS and version update

---
 NEWS    | 15 +++++++++++++++
 VERSION |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 91f489296..94f07d65b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Version 2.18 (2025-12-26)
+  o BGP: Support for dynamic onlink and link-local connections
+  o BGP: Listening socket refactoring
+  o BGP: Fix restart behavior on outgoing next hop setting
+  o BGP: Configuring global/link-local IPv6 nexthop
+  o BGP: Disallow AS Sets by default
+  o L3VPN: Support for import/export target none and import target all
+  o RAdv: P-flag to prefer prefix delegation in DHCPv6
+  o Filter: Merging of case intervals
+  o Filter: Append operator
+  o ASPA: Paths containing AS_SET are invalid
+  o Doc: Update website to bird.nic.cz
+  o CI: Upstream packaging cleanup and reproducible builds
+  o Various minor fixes in code, comments, documentation and tooling
+
 Version 2.17.1 (2025-04-29)
   o BSD: Fix build on NetBSD
   o BGP: Fix crash when incoming connection for disabled protocol arrives
diff --git a/VERSION b/VERSION
index 3f8eb714d..fc249e9a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.17.1
+2.18
-- 
2.47.3