diff --git a/.CHANGES.NEW b/.CHANGES.NEW
index a9b35f020..954a571b7 100644
--- a/.CHANGES.NEW
+++ b/.CHANGES.NEW
@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for UnrealIRCd 4.0.0-rc5
+                                for UnrealIRCd 4.0.0-rc6
                                     
 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/Config b/Config
index b6e98f741..875a07baf 100755
--- a/Config
+++ b/Config
@@ -443,7 +443,7 @@ echo ""
 
 if [ -z "$NOCACHE" ] ; then
 	# This needs to be updated each release so auto-upgrading works for settings, modules, etc!!:
-	UNREALRELEASES="unrealircd-4.0.0-rc4 unrealircd-4.0.0-rc3 unrealircd-4.0.0-rc2 unrealircd-4.0.0-rc1"
+	UNREALRELEASES="unrealircd-4.0.0-rc5 unrealircd-4.0.0-rc4 unrealircd-4.0.0-rc3 unrealircd-4.0.0-rc2 unrealircd-4.0.0-rc1"
 	if [ -f "config.settings" ]; then
 		. ./config.settings
 	else
diff --git a/configure b/configure
index c77d2877a..94a0e6c35 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.0-rc5.
+# Generated by GNU Autoconf 2.69 for unrealircd 4.0.0-rc6.
 #
 # 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.0-rc5'
-PACKAGE_STRING='unrealircd 4.0.0-rc5'
+PACKAGE_VERSION='4.0.0-rc6'
+PACKAGE_STRING='unrealircd 4.0.0-rc6'
 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.0-rc5 to adapt to many kinds of systems.
+\`configure' configures unrealircd 4.0.0-rc6 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.0-rc5:";;
+     short | recursive ) echo "Configuration of unrealircd 4.0.0-rc6:";;
    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.0-rc5
+unrealircd configure 4.0.0-rc6
 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.0-rc5, which was
+It was created by unrealircd $as_me 4.0.0-rc6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8251,7 +8251,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.0-rc5, which was
+This file was extended by unrealircd $as_me 4.0.0-rc6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8314,7 +8314,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.0-rc5
+unrealircd config.status 4.0.0-rc6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 926b107c1..8645f4634 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.0-rc5], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
+AC_INIT([unrealircd], [4.0.0-rc6], [http://bugs.unrealircd.org/], [], [http://unrealircd.org/])
 AC_CONFIG_SRCDIR([src/ircd.c])
 AC_CONFIG_HEADER([include/setup.h])
 AC_CONFIG_AUX_DIR([autoconf])
diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES
index 412a1b9c6..f06cc0582 100644
--- a/doc/RELEASE-NOTES
+++ b/doc/RELEASE-NOTES
@@ -1,7 +1,7 @@
-UnrealIRCd 4.0.0-rc5 Release Notes
+UnrealIRCd 4.0.0-rc6 Release Notes
 ===================================
 
-This is the fifth Release Candidate for UnrealIRCd 4.
+This is the sixth Release Candidate for UnrealIRCd 4.
 We plan to have a 'stable' UnrealIRCd 4.0.0 release in December 2015.
 
 IMPORTANT REMARKS:
@@ -18,7 +18,7 @@ IMPORTANT REMARKS:
   release *candidate* it may crash occasionally or have issues.
 
 Feel free to:
-* Install 4.0.0-rc5 to play around, show to your friends, have fun with
+* Install 4.0.0-rc6 to play around, show to your friends, have fun with
   the latest features and improvements, test things.
 * Link in an UnrealIRCd 4 test server to your 3.2.x network
 * Report any problems, bugs, issues and other feedback on
@@ -41,7 +41,7 @@ UnrealIRCd 4 uses a new directory structure.
       target directory to install UnrealIRCd to. ./Config will ask this
       and it's ~/unrealircd by default (eg: /home/nerd/unrealircd).
       You also need to run 'make install' after 'make' now.
-      After compiling, you should leave your unrealircd-4.0.0-rc5 directory
+      After compiling, you should leave your unrealircd-4.0.0-rc6 directory
       and change to ~/unrealircd as everything takes place there.
       For example to start UnrealIRCd you run './unrealircd start'
       (again, from the /home/xxxx/unrealircd directory).
@@ -282,11 +282,11 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
 * OS X and *BSD: serious problems with the I/O engine [RC2]
 * Crash with invite-notify, now removed [RC2, RC3]
 * Odd behavior and possible crash in /WHOIS [RC3]
-* Strange empty host bug [RC3]
 * Crash on linking attempt [RC4]
 * Crash on boot if mode +f was present in set::modes-on-join [RC4]
 * Crash on windows when connecting [RC5]
 * Added workaround for "Cannot accept connections" flood [RC5]
+* User could get an empty hostname [RC6]
 
 ==[ MINOR BUGS FIXED ]==
 * Errors in example configuration files [A2]
@@ -318,6 +318,9 @@ listed on: https://www.unrealircd.org/docs/Upgrading_from_3.2.x
 * LIST never ended if listing more than 50-100 channels [RC5]
 * IRCOps did not see JOIN error messages [RC5]
 * SAJOIN ignored set::level-on-join [RC5]
+* CAP REQ did not work with multiple arguments [RC6]
+* The 'unrealircd' script was always installed to ~/unrealircd [RC6]
+* Some small memory leaks [RC6]
 
 ==[ REMOVED / DROPPED ]==
 * Numeric server IDs, see above. [A1]
diff --git a/include/config.h b/include/config.h
index ed6d5e8c8..a3e2f1e1e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -458,8 +458,7 @@
 /* Use TRE Regex Library (as well) ? */
 #define USE_TRE
 
-/* The 3.4-alpha* series, especially the first few, are highly experimental.
- * If EXPERIMENTAL is #define'd then all users will receive a notice about
+/* If EXPERIMENTAL is #define'd then all users will receive a notice about
  * this when they connect, along with a pointer to bugs.unrealircd.org where
  * they can report any problems. This is mainly to help UnrealIRCd development.
  */
diff --git a/include/win32/setup.h b/include/win32/setup.h
index 14fea48fc..52a41d100 100644
--- a/include/win32/setup.h
+++ b/include/win32/setup.h
@@ -81,6 +81,6 @@
 
 /* Version suffix such as a beta marker or release candidate marker. (e.g.:
    -rcX for unrealircd-3.2.9-rcX) */
-#define UNREAL_VERSION_SUFFIX "-rc5"
+#define UNREAL_VERSION_SUFFIX "-rc6"
 
 #endif
diff --git a/src/version.c.SH b/src/version.c.SH
index a87d56729..2576eeeda 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.0-rc5"
+id="4.0.0-rc6"
 echo "$id"
 
 if test -r version.c
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 628fec2c3..ea83bc052 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -6,7 +6,7 @@
 
 [Setup]
 AppName=UnrealIRCd 4
-AppVerName=UnrealIRCd 4.0.0-rc5
+AppVerName=UnrealIRCd 4.0.0-rc6
 AppPublisher=UnrealIRCd Team
 AppPublisherURL=https://www.unrealircd.org
 AppSupportURL=https://www.unrealircd.org