diff --git a/.RELEASE.NOTES b/.RELEASE.NOTES
index 162053efe..c63336a24 100644
--- a/.RELEASE.NOTES
+++ b/.RELEASE.NOTES
@@ -1,8 +1,8 @@
 
-Unreal3.1.5.1-Valek Release Notes
+Unreal3.1.6-Noon Release Notes
 ===================================
 
-* Um, yea, so we found this bug...
+* Initial release preparation, no bugs fixed yet!
 
 * If you are upgrading from Unreal3.1.4-Meadows, please read
   doc/RELEASE-NOTES.3.1.5 as well.
diff --git a/Changes b/Changes
index 8e45a198d..333eec1b2 100644
--- a/Changes
+++ b/Changes
@@ -780,3 +780,20 @@ probably isn't a good thing
 ===================================
 
 *** Unreal 3.1.5.1 Released ***
+
+[ Unreal 3.1.6 ]
+--------------------------------------------------
+No comment.
+--------------------------------------------------
+
+Initial release prep, changing version numbers in cvs
+(again).
+===================================
+
+Fixed /botserv bug, reported by SciFi
+--Luke
+===================================
+
+Unbroke +A channels and bans. :-/
+--Luke
+===================================
diff --git a/Config b/Config
index 42059c744..3eac295a3 100755
--- a/Config
+++ b/Config
@@ -11,7 +11,7 @@
 # distribution without the author's prior consent.
 #
 # $Id$
-IRCD_VERSION="Unreal3.1.5.1 Valek"
+IRCD_VERSION="Unreal3.1.6 Noon"
 CONF_DATE=`date`
 LAST_VERSION="very very old"
 #
diff --git a/Unreal.nfo b/Unreal.nfo
index 3af63274a..04f67cb5e 100644
--- a/Unreal.nfo
+++ b/Unreal.nfo
@@ -1,5 +1,5 @@
 ===============================================
-=            UnrealIRCd v3.1.5.1              =
+=            UnrealIRCd v3.1.6                =
 ===============================================
  Was brought to you by:
   * Stskeeps  <stskeeps@unrealircd.com>
diff --git a/include/msg.h b/include/msg.h
index a4187021a..cef81c403 100644
--- a/include/msg.h
+++ b/include/msg.h
@@ -503,8 +503,8 @@ struct Message msgtab[] = {
 	{MSG_SVSNAME, m_chgname, 0, MAXPARA, TOK_CHGNAME, 0L},
 	{MSG_SHUN, m_shun, 0, MAXPARA, TOK_SHUN, 0L},
 	{MSG_NEWJOIN, m_join, 0, MAXPARA, TOK_JOIN, 0L},
-	{MSG_BOTSERV, m_botserv, 0, MAXPARA, TOK_BOTSERV,0L},
-	{TOK_BOTSERV, m_botserv, 0, MAXPARA, TOK_BOTSERV,0L},
+	{MSG_BOTSERV, m_botserv, 0, 1, TOK_BOTSERV,0L},
+	{TOK_BOTSERV, m_botserv, 0, 1, TOK_BOTSERV,0L},
 	{(char *)0, (int (*)())0, 0, 0, 0, 0L}
 };
 
diff --git a/include/version.h b/include/version.h
index 2e73df39d..9e5bfb9a4 100644
--- a/include/version.h
+++ b/include/version.h
@@ -25,14 +25,14 @@
      /**/
 #define COMPILEINFO DEBUGMODESET DEBUGSET
 /*
- * Version Unreal3.1.5.1-Valek
+ * Version Unreal3.1.6-Noon
  */
 #define UnrealProtocol 		2302
 #define PATCH1  		"3"
 #define PATCH2  		".1"
-#define PATCH3  		".5"
-#define PATCH4  		".1"
-#define PATCH5  		"-Valek"
+#define PATCH3  		".6"
+#define PATCH4  		"-Noon"
+#define PATCH5  		"[beta1]"
 #define PATCH6  		""
 #define PATCH7  		""
 #define PATCH8  		COMPILEINFO
diff --git a/include/win32/settings.h b/include/win32/settings.h
index 265fb33c0..425af0443 100644
--- a/include/win32/settings.h
+++ b/include/win32/settings.h
@@ -1,5 +1,5 @@
 /*
- * VERSION: Unreal3.1.5.1 Valek
+ * VERSION: Unreal3.1.6 Noon
  * DATE:    Sat Jun 15 13:43:51 EST 2002
  * OS:      Win-32
  *
diff --git a/src/channel.c b/src/channel.c
index 9637d4042..344199561 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2288,12 +2288,11 @@ static int can_join(cptr, sptr, chptr, key, link, parv)
 	char *parv[];
 {
 	Link *lp;
+	Ban *banned = NULL;
 
 	if ((chptr->mode.mode & MODE_ONLYSECURE) &&
 		!(sptr->umodes & UMODE_SECURE))
-	{
 		return (ERR_SECUREONLYCHAN);
-	}
 
 	if ((chptr->mode.mode & MODE_OPERONLY) && !IsOper(sptr))
 		return (ERR_OPERONLY);
@@ -2306,15 +2305,17 @@ static int can_join(cptr, sptr, chptr, key, link, parv)
 		return (ERR_NOHIDING);
 #endif
 
+	banned = is_banned(cptr, sptr, chptr);
+
         /* Admin, Coadmin, Netadmin, and SAdmin can still walk +b in +O */
 	if (IsOper(sptr) && !IsAdmin(sptr) && !IsCoAdmin(sptr) && !IsNetAdmin(sptr)
-            && !IsSAdmin(sptr) && is_banned(cptr, sptr, chptr)
+            && !IsSAdmin(sptr) && banned
             && (chptr->mode.mode & MODE_OPERONLY))
 		return (ERR_BANNEDFROMCHAN); 
 
         /* Only NetAdmin/SAdmin can walk +b in +A */
 	if (IsOper(sptr) && !IsNetAdmin(sptr) && !IsSAdmin(sptr)
-	    && (chptr->mode.mode & MODE_ADMONLY))
+	    && banned && (chptr->mode.mode & MODE_ADMONLY))
 		return (ERR_BANNEDFROMCHAN);
 
 	for (lp = sptr->user->invited; lp; lp = lp->next)
@@ -2353,7 +2354,7 @@ static int can_join(cptr, sptr, chptr, key, link, parv)
 	if ((chptr->mode.limit && chptr->users >= chptr->mode.limit))
 		return (ERR_CHANNELISFULL);
 
-	if (is_banned(sptr, sptr, chptr))
+	if (banned)
 		return (ERR_BANNEDFROMCHAN);
 
 #ifndef NO_OPEROVERRIDE
diff --git a/update b/update
index 64c43a0c2..097c296b2 100755
--- a/update
+++ b/update
@@ -7,7 +7,7 @@
 # or included in any package without permission from the author.
 #
 # NO WARRANTY IS INCLUDED
-CURRENT_VERSION="Unreal3.1.5.1-Valek"
+CURRENT_VERSION="Unreal3.1.6-Noon"
 WHATYAWANT="wget"
 clear
 cat .UPDATE