diff --git a/.CHANGES.NEW b/.CHANGES.NEW
index 3d37ddbba..dbccb0909 100644
--- a/.CHANGES.NEW
+++ b/.CHANGES.NEW
@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for UnrealIRCd 4.0.6
+                                for UnrealIRCd 4.0.7-rc1
                                     
 This program will help you to compile your IRC server, and ask you
 questions regarding the compile-time settings of it during the process. 
diff --git a/configure b/configure
index 6b16eca5b..e15ecd0f7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unrealircd 4.0.6.
+# Generated by GNU Autoconf 2.69 for unrealircd 4.0.7-rc1.
 #
 # Report bugs to <http://bugs.unrealircd.org/>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unrealircd'
 PACKAGE_TARNAME='unrealircd'
-PACKAGE_VERSION='4.0.6'
-PACKAGE_STRING='unrealircd 4.0.6'
+PACKAGE_VERSION='4.0.7-rc1'
+PACKAGE_STRING='unrealircd 4.0.7-rc1'
 PACKAGE_BUGREPORT='http://bugs.unrealircd.org/'
 PACKAGE_URL='http://unrealircd.org/'
 
@@ -1311,7 +1311,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unrealircd 4.0.6 to adapt to many kinds of systems.
+\`configure' configures unrealircd 4.0.7-rc1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1376,7 +1376,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unrealircd 4.0.6:";;
+     short | recursive ) echo "Configuration of unrealircd 4.0.7-rc1:";;
    esac
   cat <<\_ACEOF
 
@@ -1524,7 +1524,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unrealircd configure 4.0.6
+unrealircd configure 4.0.7-rc1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2130,7 +2130,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unrealircd $as_me 4.0.6, which was
+It was created by unrealircd $as_me 4.0.7-rc1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2536,7 +2536,7 @@ _ACEOF
 
 
 # Minor version number (e.g.: Z in X.Y.Z)
-UNREAL_VERSION_MINOR="6"
+UNREAL_VERSION_MINOR="7"
 
 cat >>confdefs.h <<_ACEOF
 #define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR
@@ -2546,7 +2546,7 @@ _ACEOF
 # The version suffix such as a beta marker or release candidate
 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
 # string instead of an integer because it contains arbitrary data.
-UNREAL_VERSION_SUFFIX=""
+UNREAL_VERSION_SUFFIX="-rc1"
 
 cat >>confdefs.h <<_ACEOF
 #define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"
@@ -8298,7 +8298,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unrealircd $as_me 4.0.6, which was
+This file was extended by unrealircd $as_me 4.0.7-rc1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8361,7 +8361,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unrealircd config.status 4.0.6
+unrealircd config.status 4.0.7-rc1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 0b0cb896b..163234ac9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl src/win32/unrealinst.iss
 dnl .CHANGES.NEW
 dnl src/version.c.SH
 
-AC_INIT([unrealircd], [4.0.6], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
+AC_INIT([unrealircd], [4.0.7-rc1], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
 AC_CONFIG_SRCDIR([src/ircd.c])
 AC_CONFIG_HEADER([include/setup.h])
 AC_CONFIG_AUX_DIR([autoconf])
@@ -32,13 +32,13 @@ UNREAL_VERSION_MAJOR=["0"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)])
 
 # Minor version number (e.g.: Z in X.Y.Z)
-UNREAL_VERSION_MINOR=["6"]
+UNREAL_VERSION_MINOR=["7"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: Z for X.Y.Z)])
 
 # The version suffix such as a beta marker or release candidate
 # marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
 # string instead of an integer because it contains arbitrary data.
-UNREAL_VERSION_SUFFIX=[""]
+UNREAL_VERSION_SUFFIX=["-rc1"]
 AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)])
 
 AC_PROG_CC
diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES
index 843d199f7..e4a4f58cc 100644
--- a/doc/RELEASE-NOTES
+++ b/doc/RELEASE-NOTES
@@ -1,9 +1,30 @@
-UnrealIRCd 4.0.6 Release Notes
-===============================
+UnrealIRCd 4.0.7-rc1 Release Notes
+===================================
+
+==[ CHANGES BETWEEN 4.0.6 AND 4.0.7 ]==
+Improvements:
+* UnrealIRCd now ships with a default ciphersuite list to have more
+  secure SSL/TLS defaults (rather than relying on your OS/Distro).
+  You can still customize ciphersuites through set::ssl::ciphers.
+  Details: https://www.unrealircd.org/docs/SSL_Ciphers_and_protocols
+* set::ssl::protocols allows you to specify which SSL/TLS protocols
+  are permitted. The default is (still): TLSv1,TLSv1.1,TLSv1.2.
 
-==[ CHANGES BETWEEN 4.0.5 AND 4.0.6 ]==
 Major issues fixed:
-* Fix SASL security issue with AUTHENTICATE
+* FreeBSD: unstable SSL links to other servers
+
+Minor issues fixed:
+* It was impossible to set both +b ~r:xyz and +b ~R:xyz
+
+Removed the following rarely used build-time options:
+* CHROOTDIR: Never worked in 4.0.x anyway. You can use AppArmor,
+  SELinux, FreeBSD jails, etc. as an alternative.
+* IRC_USER/IRC_GROUP: Since this only applies to users installing
+  UnrealIRCd system-wide you should use your system services to do
+  this as well, such as: systemd's User=xx or start-stop-daemon.
+
+Other changes:
+* PCRE2 and c-ares libraries updated to latest versions
 
 ==[ UNREALIRCD 4 INTRODUCTION ]==
 
@@ -76,6 +97,16 @@ For support you have two choices:
 * Forums: https://forums.unrealircd.org/
 * IRC: irc.unrealircd.org / #unreal-support
 
+==[ CHANGES BETWEEN 4.0.5 AND 4.0.6 ]==
+Major issues fixed:
+* Fix SASL security issue with AUTHENTICATE
+
+==[ CHANGES BETWEEN 4.0.4 AND 4.0.5 ]==
+Major issues fixed:
+* Crash issue (read-after-free)
+* Bans on IPv6 cloaked hosts had no effect
+* Prevent flood from unknown connection (with bugfix)
+
 ==[ CHANGES BETWEEN 4.0.4 AND 4.0.3(.1) ]==
 New:
 * Italian /HELPOP translation (help.it.conf)
diff --git a/include/h.h b/include/h.h
index 9cc81bc1a..f69a4db19 100644
--- a/include/h.h
+++ b/include/h.h
@@ -777,3 +777,4 @@ extern int m_rehash(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 extern int m_die(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 extern int m_restart(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 extern void ban_flooder(aClient *cptr);
+extern char *pcre2_version(void);
diff --git a/include/win32/setup.h b/include/win32/setup.h
index 57e025e6a..ce7e204f5 100644
--- a/include/win32/setup.h
+++ b/include/win32/setup.h
@@ -77,10 +77,10 @@
 #define UNREAL_VERSION_MAJOR 0
 
 /* Minor version number (e.g.: 1 for Unreal3.2.1) */
-#define UNREAL_VERSION_MINOR 6
+#define UNREAL_VERSION_MINOR 7
 
 /* Version suffix such as a beta marker or release candidate marker. (e.g.:
    -rcX for unrealircd-3.2.9-rcX) */
-#define UNREAL_VERSION_SUFFIX ""
+#define UNREAL_VERSION_SUFFIX "-rc1"
 
 #endif
diff --git a/src/version.c.SH b/src/version.c.SH
index 0c4ddb7e9..229a1956b 100644
--- a/src/version.c.SH
+++ b/src/version.c.SH
@@ -4,7 +4,7 @@ echo "Extracting src/version.c..."
 
 #id=`grep '$Id: Changes,v' ../Changes`
 #id=`echo $id |sed 's/.* Changes\,v \(.*\) .* Exp .*/\1/'`
-id="4.0.6"
+id="4.0.7-rc1"
 echo "$id"
 
 if test -r version.c
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 207f43f1b..e6b2f623d 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -6,7 +6,7 @@
 
 [Setup]
 AppName=UnrealIRCd 4
-AppVerName=UnrealIRCd 4.0.6
+AppVerName=UnrealIRCd 4.0.7-rc1
 AppPublisher=UnrealIRCd Team
 AppPublisherURL=https://www.unrealircd.org
 AppSupportURL=https://www.unrealircd.org