From da85a75f203a293ac4b6013de03c94cc3f25054e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Thu, 5 Oct 2023 12:45:08 +0200
Subject: [PATCH] Release 6.0.4, including NEWS this time

---
 NEWS        | 12 +++++++-----
 meson.build |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index ce91b3800..ba572f01b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-Knot Resolver 6.0.0 (2023-mm-dd)
+Knot Resolver 6.0.4 (2023-10-05)
 ================================
 
-Improvements
-------------
-- Knot Resolver v6 alpha starts
-- 6.0.x versions are dedicated to alpha cycle
+6.0.x are "early access" versions,
+not generally recommended for production use.
+
+6.0 contains biggest changes in the history of Knot Resolver releases.
+You will have to rewrite your configuration.  See documentation, in particular:
+https://knot.pages.nic.cz/knot-resolver/upgrading-to-6.html
 
 
 Knot Resolver 5.7.0 (2023-08-22)
diff --git a/meson.build b/meson.build
index e0f7b14cd..0b3430439 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
   'knot-resolver',
   ['c', 'cpp'],
   license: 'GPLv3+',
-  version: '6.0.3',
+  version: '6.0.4',
   default_options: ['c_std=gnu11', 'b_ndebug=true'],
   meson_version: '>=0.49',
 )
-- 
2.47.2