From 17776e527456014d892124fbb4e4f1ebe58c1353 Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Wed, 15 Aug 2018 23:00:26 +0100
Subject: [PATCH] charybdis 4.1.1

---
 NEWS.md      | 12 +++++++++++-
 configure.ac |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index d8db07a2..82a21b75 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,8 +1,18 @@
 # News
 
-This is charybdis 4.1-dev, Copyright (c) 2005-2018 Charybdis team.
+This is charybdis 4.1.1, Copyright (c) 2005-2018 Charybdis team.
 See LICENSE for licensing details (GPL v2).
 
+## charybdis-4.1.1
+
+### security
+- Fix an issue with the PASS command and duplicate server instances.
+
+### misc
+- Fix connection hang with blacklist/opm when ident is disabled.
+- Improve SASL CAP notification when the services server disconnects.
+- MbedTLS: Support ChaCha20-Poly1305 in default cipher suites.
+
 ## charybdis-4.1
 
 ### misc
diff --git a/configure.ac b/configure.ac
index 2c4d0354..805a5e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl said functions need to be just about as complex as they already are.
 
 AC_PREREQ(2.60)
 
-AC_INIT([charybdis], [4.1-dev])
+AC_INIT([charybdis], [4.1.1])
 
 AC_LANG(C)
 AC_USE_SYSTEM_EXTENSIONS