diff --git a/.CHANGES.NEW b/.CHANGES.NEW
index 5d9834b7f..c8d9d8ae7 100644
--- a/.CHANGES.NEW
+++ b/.CHANGES.NEW
@@ -7,7 +7,7 @@
  \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
 
                                Configuration Program
-                                for Unreal3.2.2
+                                for Unreal3.2.2b
                                     
 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/.RELEASE.NOTES b/.RELEASE.NOTES
index 075563bb9..9fd1b7cc2 100644
--- a/.RELEASE.NOTES
+++ b/.RELEASE.NOTES
@@ -1,6 +1,10 @@
 
-Unreal3.2.2 Release Notes
-==========================
+Unreal3.2.2b Release Notes
+===========================
+
+** NOTE: This 'b' release of 3.2.2 includes the fix for the crashbug
+   reported on January 15 2005. That's also all it adds when compared
+   to 3.2.2, no other fixes/new features/etc **
 
 ==[ GENERAL INFORMATION ]==
 - If you are upgrading on *NIX, make sure you run 'make clean' and './Config'
diff --git a/Changes b/Changes
index 91dce4664..64ffdbee0 100644
--- a/Changes
+++ b/Changes
@@ -411,3 +411,5 @@
 - Forgot to mention away spamfilter target in helpop, reported by Rocko.
 - Changed version to 3.2.2
 ** 3.2.2 release **
+- Fixed Jan-15-2005 crashbug (see .RELEASE.NOTES)
+** 3.2.2b release **
diff --git a/Unreal.nfo b/Unreal.nfo
index 9b05da382..b58675da8 100644
--- a/Unreal.nfo
+++ b/Unreal.nfo
@@ -1,5 +1,5 @@
 ===============================================
-=            UnrealIRCd v3.2.2                =
+=            UnrealIRCd v3.2.2b               =
 ===============================================
  Was brought to you by:
 
diff --git a/include/version.h b/include/version.h
index 3a2a7f18d..4a12bf3e9 100644
--- a/include/version.h
+++ b/include/version.h
@@ -30,7 +30,7 @@
 #define PATCH1  		"3"
 #define PATCH2  		".2"
 #define PATCH3  		".2"
-#define PATCH4  		""
+#define PATCH4  		"b"
 #define PATCH5  		""
 #define PATCH6  		""
 #define PATCH7  		""
diff --git a/src/modules/m_kick.c b/src/modules/m_kick.c
index 11e252a05..d57b5b225 100644
--- a/src/modules/m_kick.c
+++ b/src/modules/m_kick.c
@@ -302,13 +302,17 @@ CMD_FUNC(m_kick)
 					    !(lp->flags & (CHFL_CHANOP|CHFL_CHANPROT|CHFL_CHANOWNER)))
 					{
 						/* Send it only to chanops & victim */
-						sendto_chanops_butone(who, chptr, ":%s!%s@%s KICK %s %s :%s",
-							sptr->name, sptr->user->username, GetHost(sptr),
-							chptr->chname, who->name, comment);
-						if (MyClient(who))
-							sendto_one(who, ":%s!%s@%s KICK %s %s :%s",
+						if (IsPerson(sptr))
+							sendto_chanops_butone(who, chptr, ":%s!%s@%s KICK %s %s :%s",
 								sptr->name, sptr->user->username, GetHost(sptr),
 								chptr->chname, who->name, comment);
+						else
+							sendto_chanops_butone(who, chptr, ":%s KICK %s %s :%s",
+								sptr->name, chptr->chname, who->name, comment);
+						
+						if (MyClient(who))
+							sendto_prefix_one(who, sptr, ":%s KICK %s %s :%s",
+								sptr->name, chptr->chname, who->name, comment);
 					} else {
 						/* NORMAL */
 						sendto_channel_butserv(chptr,
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 464bbf436..fc1a0eefb 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -11,7 +11,7 @@
 
 [Setup]
 AppName=UnrealIRCd
-AppVerName=UnrealIRCd3.2.2
+AppVerName=UnrealIRCd3.2.2b
 AppPublisher=UnrealIRCd Team
 AppPublisherURL=http://www.unrealircd.com
 AppSupportURL=http://www.unrealircd.com