diff --git a/NEWS b/NEWS
index 1e60c0f..fa6ee2d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 This is ShadowIRCd 6.3, Copyright (c) 2005-2011 ShadowIRCd team.
 See LICENSE for licensing details (GPL v2).
 
+-- shadowircd 6.3.1
+
+bugfixes
+- When setting/unsetting cmode +M, wallops are only sent once, globally, 
+  not for every server on the network where the mode change happens.
+- Don't allow +Z to be set by default_umodes.
+- Cope with OPENSSL_VERSION_NUMBER not being a long. This is the case on
+  very new FreeBSD versions.
+- Disallow mIRC italics in channel names when disable_fake_channels is in use.
+- Allow kick_on_split_riding to protect channels with mlocked keys.
+
 -- shadowircd-6.3.0
 
 new modes
diff --git a/configure b/configure
index 12538ca..133320f 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.68 for shadowircd 6.3.0.
+# Generated by GNU Autoconf 2.68 for shadowircd 6.3.1.
 #
 # $Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $
 #
@@ -559,8 +559,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shadowircd'
 PACKAGE_TARNAME='shadowircd'
-PACKAGE_VERSION='6.3.0'
-PACKAGE_STRING='shadowircd 6.3.0'
+PACKAGE_VERSION='6.3.1'
+PACKAGE_STRING='shadowircd 6.3.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1274,7 +1274,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 shadowircd 6.3.0 to adapt to many kinds of systems.
+\`configure' configures shadowircd 6.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1335,7 +1335,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadowircd 6.3.0:";;
+     short | recursive ) echo "Configuration of shadowircd 6.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1454,7 +1454,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadowircd configure 6.3.0
+shadowircd configure 6.3.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2053,7 +2053,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 shadowircd $as_me 6.3.0, which was
+It was created by shadowircd $as_me 6.3.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -9990,7 +9990,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 shadowircd $as_me 6.3.0, which was
+This file was extended by shadowircd $as_me 6.3.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10052,7 +10052,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="\\
-shadowircd config.status 6.3.0
+shadowircd config.status 6.3.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index be12d78..da890fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([shadowircd],[6.3.0])
+AC_INIT([shadowircd],[6.3.1])
 
 AC_CONFIG_HEADER(include/setup.h)