diff --git a/configure b/configure
index 75be707cf..67dbb269c 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.71 for unrealircd 6.1.6-git.
+# Generated by GNU Autoconf 2.71 for unrealircd 6.1.6-rc1.
 #
 # Report bugs to <https://bugs.unrealircd.org/>.
 #
@@ -611,8 +611,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unrealircd'
 PACKAGE_TARNAME='unrealircd'
-PACKAGE_VERSION='6.1.6-git'
-PACKAGE_STRING='unrealircd 6.1.6-git'
+PACKAGE_VERSION='6.1.6-rc1'
+PACKAGE_STRING='unrealircd 6.1.6-rc1'
 PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'
 PACKAGE_URL='https://unrealircd.org/'
 
@@ -1372,7 +1372,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 6.1.6-git to adapt to many kinds of systems.
+\`configure' configures unrealircd 6.1.6-rc1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1438,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unrealircd 6.1.6-git:";;
+     short | recursive ) echo "Configuration of unrealircd 6.1.6-rc1:";;
    esac
   cat <<\_ACEOF
 
@@ -1616,7 +1616,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unrealircd configure 6.1.6-git
+unrealircd configure 6.1.6-rc1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1915,7 +1915,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 6.1.6-git, which was
+It was created by unrealircd $as_me 6.1.6-rc1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2706,7 +2706,7 @@ printf "%s\n" "#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR" >>confdefs.h
 # 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="-git"
+UNREAL_VERSION_SUFFIX="-rc1"
 
 printf "%s\n" "#define UNREAL_VERSION_SUFFIX \"$UNREAL_VERSION_SUFFIX\"" >>confdefs.h
 
@@ -8027,8 +8027,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE2" >&5
-printf %s "checking for PCRE2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.36" >&5
+printf %s "checking for libpcre2-8 >= 10.36... " >&6; }
 
 if test -n "$PCRE2_CFLAGS"; then
     pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS"
@@ -8068,7 +8068,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8077,24 +8077,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8 >= 10.36" 2>&1`
+                PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8 >= 10.36" 2>&1`
         else
-	        PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8 >= 10.36" 2>&1`
+                PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8 >= 10.36" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PCRE2_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$PCRE2_PKG_ERRORS" >&5
 
-	has_system_pcre2=no
+        has_system_pcre2=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_pcre2=no
+        has_system_pcre2=no
 else
-	PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
-	PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
+        PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
+        PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_pcre2=yes
+        has_system_pcre2=yes
 if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libpcre2*
@@ -8152,8 +8152,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ARGON2" >&5
-printf %s "checking for ARGON2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libargon2 >= 0~20161029" >&5
+printf %s "checking for libargon2 >= 0~20161029... " >&6; }
 
 if test -n "$ARGON2_CFLAGS"; then
     pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
@@ -8193,7 +8193,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8202,24 +8202,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
+                ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
         else
-	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
+                ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ARGON2_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$ARGON2_PKG_ERRORS" >&5
 
-	has_system_argon2=no
+        has_system_argon2=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_argon2=no
+        has_system_argon2=no
 else
-	ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
-	ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
+        ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
+        ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_argon2=yes
+        has_system_argon2=yes
 if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libargon2*
@@ -8273,8 +8273,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SODIUM" >&5
-printf %s "checking for SODIUM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.16" >&5
+printf %s "checking for libsodium >= 1.0.16... " >&6; }
 
 if test -n "$SODIUM_CFLAGS"; then
     pkg_cv_SODIUM_CFLAGS="$SODIUM_CFLAGS"
@@ -8314,7 +8314,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8323,24 +8323,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SODIUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsodium >= 1.0.16" 2>&1`
+                SODIUM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsodium >= 1.0.16" 2>&1`
         else
-	        SODIUM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsodium >= 1.0.16" 2>&1`
+                SODIUM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsodium >= 1.0.16" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SODIUM_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SODIUM_PKG_ERRORS" >&5
 
-	has_system_sodium=no
+        has_system_sodium=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_sodium=no
+        has_system_sodium=no
 else
-	SODIUM_CFLAGS=$pkg_cv_SODIUM_CFLAGS
-	SODIUM_LIBS=$pkg_cv_SODIUM_LIBS
+        SODIUM_CFLAGS=$pkg_cv_SODIUM_CFLAGS
+        SODIUM_LIBS=$pkg_cv_SODIUM_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_sodium=yes
+        has_system_sodium=yes
 if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libsodium*
@@ -8402,8 +8402,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5
-printf %s "checking for CARES... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcares >= 1.6.0" >&5
+printf %s "checking for libcares >= 1.6.0... " >&6; }
 
 if test -n "$CARES_CFLAGS"; then
     pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
@@ -8443,7 +8443,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8452,24 +8452,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
+                CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
         else
-	        CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
+                CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CARES_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$CARES_PKG_ERRORS" >&5
 
-	has_system_cares=no
+        has_system_cares=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_cares=no
+        has_system_cares=no
 else
-	CARES_CFLAGS=$pkg_cv_CARES_CFLAGS
-	CARES_LIBS=$pkg_cv_CARES_LIBS
+        CARES_CFLAGS=$pkg_cv_CARES_CFLAGS
+        CARES_LIBS=$pkg_cv_CARES_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_cares=yes
+        has_system_cares=yes
 if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libcares*
@@ -8548,8 +8548,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
-printf %s "checking for JANSSON... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.0.0" >&5
+printf %s "checking for jansson >= 2.0.0... " >&6; }
 
 if test -n "$JANSSON_CFLAGS"; then
     pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
@@ -8589,7 +8589,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8598,24 +8598,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.0.0" 2>&1`
+                JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson >= 2.0.0" 2>&1`
         else
-	        JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.0.0" 2>&1`
+                JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson >= 2.0.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JANSSON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$JANSSON_PKG_ERRORS" >&5
 
-	has_system_jansson=no
+        has_system_jansson=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_jansson=no
+        has_system_jansson=no
 else
-	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
-	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
+        JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
+        JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_jansson=yes
+        has_system_jansson=yes
 if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libjansson*
@@ -9345,8 +9345,8 @@ then :
 				has_system_geoip_classic="no"
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GEOIP_CLASSIC" >&5
-printf %s "checking for GEOIP_CLASSIC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for geoip >= 1.6.0" >&5
+printf %s "checking for geoip >= 1.6.0... " >&6; }
 
 if test -n "$GEOIP_CLASSIC_CFLAGS"; then
     pkg_cv_GEOIP_CLASSIC_CFLAGS="$GEOIP_CLASSIC_CFLAGS"
@@ -9386,7 +9386,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -9395,24 +9395,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEOIP_CLASSIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "geoip >= 1.6.0" 2>&1`
+                GEOIP_CLASSIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "geoip >= 1.6.0" 2>&1`
         else
-	        GEOIP_CLASSIC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "geoip >= 1.6.0" 2>&1`
+                GEOIP_CLASSIC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "geoip >= 1.6.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GEOIP_CLASSIC_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GEOIP_CLASSIC_PKG_ERRORS" >&5
 
-	has_system_geoip_classic=no
+        has_system_geoip_classic=no
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	has_system_geoip_classic=no
+        has_system_geoip_classic=no
 else
-	GEOIP_CLASSIC_CFLAGS=$pkg_cv_GEOIP_CLASSIC_CFLAGS
-	GEOIP_CLASSIC_LIBS=$pkg_cv_GEOIP_CLASSIC_LIBS
+        GEOIP_CLASSIC_CFLAGS=$pkg_cv_GEOIP_CLASSIC_CFLAGS
+        GEOIP_CLASSIC_LIBS=$pkg_cv_GEOIP_CLASSIC_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_geoip_classic=yes
+        has_system_geoip_classic=yes
 		                   if test "x$PRIVATELIBDIR" != "x"
 then :
   rm -f "$PRIVATELIBDIR/"libGeoIP.*
@@ -9489,8 +9489,8 @@ then :
 				has_system_libmaxminddb="no"
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBMAXMINDDB" >&5
-printf %s "checking for LIBMAXMINDDB... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmaxminddb >= 1.4.3" >&5
+printf %s "checking for libmaxminddb >= 1.4.3... " >&6; }
 
 if test -n "$LIBMAXMINDDB_CFLAGS"; then
     pkg_cv_LIBMAXMINDDB_CFLAGS="$LIBMAXMINDDB_CFLAGS"
@@ -9530,7 +9530,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -9539,14 +9539,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBMAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmaxminddb >= 1.4.3" 2>&1`
+                LIBMAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmaxminddb >= 1.4.3" 2>&1`
         else
-	        LIBMAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmaxminddb >= 1.4.3" 2>&1`
+                LIBMAXMINDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmaxminddb >= 1.4.3" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMAXMINDDB_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBMAXMINDDB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libmaxminddb >= 1.4.3) were not met:
+        as_fn_error $? "Package requirements (libmaxminddb >= 1.4.3) were not met:
 
 $LIBMAXMINDDB_PKG_ERRORS
 
@@ -9557,9 +9557,9 @@ Alternatively, you may set the environment variables LIBMAXMINDDB_CFLAGS
 and LIBMAXMINDDB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -9572,11 +9572,11 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	LIBMAXMINDDB_CFLAGS=$pkg_cv_LIBMAXMINDDB_CFLAGS
-	LIBMAXMINDDB_LIBS=$pkg_cv_LIBMAXMINDDB_LIBS
+        LIBMAXMINDDB_CFLAGS=$pkg_cv_LIBMAXMINDDB_CFLAGS
+        LIBMAXMINDDB_LIBS=$pkg_cv_LIBMAXMINDDB_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	has_system_libmaxminddb=yes
+        has_system_libmaxminddb=yes
 fi
 		if test "x$has_system_libmaxminddb" = "xyes"
 then :
@@ -10109,7 +10109,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 6.1.6-git, which was
+This file was extended by unrealircd $as_me 6.1.6-rc1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10174,7 +10174,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-unrealircd config.status 6.1.6-git
+unrealircd config.status 6.1.6-rc1
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 88d8e083a..bbcf61473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl src/windows/unrealinst.iss
 dnl doc/Config.header
 dnl src/version.c.SH
 
-AC_INIT([unrealircd], [6.1.6-git], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
+AC_INIT([unrealircd], [6.1.6-rc1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
 AC_CONFIG_SRCDIR([src/ircd.c])
 AC_CONFIG_HEADER([include/setup.h])
 AC_CONFIG_AUX_DIR([autoconf])
@@ -40,7 +40,7 @@ AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor versi
 # 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=["-git"]
+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_PATH_PROG(RM,rm)
diff --git a/doc/Config.header b/doc/Config.header
index 699590bc0..45a477a38 100644
--- a/doc/Config.header
+++ b/doc/Config.header
@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for UnrealIRCd 6.1.6-git
+                                for UnrealIRCd 6.1.6-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/doc/RELEASE-NOTES.md b/doc/RELEASE-NOTES.md
index 931656710..30ab73e86 100644
--- a/doc/RELEASE-NOTES.md
+++ b/doc/RELEASE-NOTES.md
@@ -1,8 +1,8 @@
-UnrealIRCd 6.1.6-git
-=================
+UnrealIRCd 6.1.6-rc1
+=====================
 
-This is the git version (development version) for future 6.1.6. This is work
-in progress and may not always be a stable version.
+This is the Release Candidate for future UnrealIRCd 6.1.6.  
+Please report any issues at https://bugs.unrealircd.org/
 
 ### Enhancements:
 * [Crule](https://www.unrealircd.org/docs/Crule) functions can now do everything
@@ -38,7 +38,8 @@ in progress and may not always be a stable version.
 
 ### Fixes:
 * Crash if you first REHASH and have a parse error (failed rehash 1) and then
-  REHASH again but a remote include fails to load (failed rehash 2).
+  REHASH again but have a "late" rehash error, such as a remote include
+  failing to load (failed rehash 2).
 * Crash on Windows when using
   [Crule](https://www.unrealircd.org/docs/Crule) functions,
   [Central Spamreport](https://www.unrealircd.org/docs/Central_spamreport) or
diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf
index 3f85c77fb..912e179d2 100644
--- a/doc/conf/modules.default.conf
+++ b/doc/conf/modules.default.conf
@@ -1,4 +1,4 @@
-/* [6.1.6-git]
+/* [6.1.6-rc1]
  * This file will load (nearly) all modules available on UnrealIRCd.
  * So all commands, channel modes, user modes, etc..
  *
diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile
index ebe5d798d..af719914d 100644
--- a/extras/doxygen/Doxyfile
+++ b/extras/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "UnrealIRCd"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 6.1.6-git
+PROJECT_NUMBER         = 6.1.6-rc1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/include/windows/setup.h b/include/windows/setup.h
index 5eb4c8821..12ca2a6ae 100644
--- a/include/windows/setup.h
+++ b/include/windows/setup.h
@@ -67,6 +67,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 "-git"
+#define UNREAL_VERSION_SUFFIX "-rc1"
 
 #endif
diff --git a/src/version.c.SH b/src/version.c.SH
index 967162a23..3a05814db 100644
--- a/src/version.c.SH
+++ b/src/version.c.SH
@@ -7,7 +7,7 @@ echo "Extracting src/version.c..."
 if [ -d ../.git ]; then
 	SUFFIX="-$(git rev-parse --short HEAD)"
 fi
-id="6.1.6-git$SUFFIX"
+id="6.1.6-rc1$SUFFIX"
 echo "$id"
 
 if test -r version.c
diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss
index c94c4399f..46ba4904e 100755
--- a/src/windows/unrealinst.iss
+++ b/src/windows/unrealinst.iss
@@ -6,7 +6,7 @@
 
 [Setup]
 AppName=UnrealIRCd 6
-AppVerName=UnrealIRCd 6.1.6-git
+AppVerName=UnrealIRCd 6.1.6-rc1
 AppPublisher=UnrealIRCd Team
 AppPublisherURL=https://www.unrealircd.org
 AppSupportURL=https://www.unrealircd.org