diff --git a/Changes b/Changes
index de00941b5..e95b6966a 100644
--- a/Changes
+++ b/Changes
@@ -51,6 +51,7 @@ Anope Version  S V N
 08/21 F Potential issues caused by not setting SO_REUSEADDR on socket.    [ #00]
 08/28 F Fixed several language & help related errors.                     [#875]
 08/28 F Replaced static count in login/opernews help.                     [#882]
+08/28 F Updated help on ChanServ AKICK.                                   [#879]
 
 Provided by Robin Burchell <w00t@inspircd.org> - 2008
 08/08 F Strict warnings in send.c from comparing address of non-ptr       [ #00]
diff --git a/lang/cat.l b/lang/cat.l
index 8d5983226..b2e1ddf57 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -4934,14 +4934,14 @@ CHAN_HELP_ACCESS_LEVELS
 	per a més informació.
 
 CHAN_HELP_AKICK
-	Sintàxi: AKICK canal ADD mascara [raó]
-	          AKICK canal STICK mascara
-	          AKICK canal UNSTICK mascara
-	          AKICK canal DEL mascara
-	          AKICK canal LIST [mascara]
-	          AKICK canal VIEW [mascara]
-	          AKICK canal ENFORCE
-	          AKICK canal CLEAR
+	Sintàxi: AKICK channel ADD {nick | mask} [reason]
+	         AKICK channel STICK mask
+	         AKICK channel UNSTICK mask
+	         AKICK channel DEL {nick | mask | entry-num | list}
+	         AKICK channel LIST [mask | entry-num | list]
+	         AKICK channel VIEW [mask | entry-num | list]
+	         AKICK canal ENFORCE
+	         AKICK canal CLEAR
 	
 	Manté la llista d'AutoKicks per a un canal. Si
 	un usuari de la llista de Autokicks intenta entrar
@@ -4953,6 +4953,9 @@ CHAN_HELP_AKICK
 	es donada amb la comanda, aquesta raó serà utilitzada quan 
 	l'usuari sigui kickejat; si no, la raó per defecte és
 	"Has sigut banejat del canal".
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	La comanda AKICK STICK baneja permanent la mascara
 	donada en el canal. Si algú intenta treure el ban,
diff --git a/lang/de.l b/lang/de.l
index b10a82301..882a7e0f5 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -4956,10 +4956,12 @@ CHAN_HELP_ACCESS_LEVELS
 	%S HELP LEVELS für weitere Informationen.
 
 CHAN_HELP_AKICK
-	Syntax: AKICK Channel ADD Maske [Grund]
-	        AKICK Channel DEL Maske
-	        AKICK Channel LIST [Maske]
-	        AKICK Channel VIEW [Maske]
+	Syntax: AKICK channel ADD {nick | mask} [reason]
+	        AKICK channel STICK mask
+	        AKICK channel UNSTICK mask
+	        AKICK channel DEL {nick | mask | entry-num | list}
+	        AKICK channel LIST [mask | entry-num | list]
+	        AKICK channel VIEW [mask | entry-num | list]
 	        AKICK Channel ENFORCE
 	        AKICK Channel CLEAR
 	
@@ -4973,6 +4975,9 @@ CHAN_HELP_AKICK
 	Befehl angegeben, wird dieser als Kick-Grund für den
 	User genutzt, ohne Reason wird standardmässig 
 	"You have been banned from the channel" verwendet.
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	Durch den AKICK DEL Befehls wird ein Eintrag von der
 	AutoKick-Liste entfernt. Es entfernt jedoch nicht die Bans,
diff --git a/lang/en_us.l b/lang/en_us.l
index a5f83ff68..d855640dc 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -4714,12 +4714,12 @@ CHAN_HELP_ACCESS_LEVELS
 	information.
 
 CHAN_HELP_AKICK
-	Syntax: AKICK channel ADD mask [reason]
+	Syntax: AKICK channel ADD {nick | mask} [reason]
 	        AKICK channel STICK mask
 	        AKICK channel UNSTICK mask
-	        AKICK channel DEL mask
-	        AKICK channel LIST [mask]
-	        AKICK channel VIEW [mask]
+	        AKICK channel DEL {nick | mask | entry-num | list}
+	        AKICK channel LIST [mask | entry-num | list]
+	        AKICK channel VIEW [mask | entry-num | list]
 	        AKICK channel ENFORCE
 	        AKICK channel CLEAR
 	
@@ -4733,6 +4733,9 @@ CHAN_HELP_AKICK
 	the command, that reason will be used when the user is
 	kicked; if not, the default reason is "You have been
 	banned from the channel".
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	The AKICK STICK command permanently bans the given mask 
 	on the channel. If someone tries to remove the ban, %S
diff --git a/lang/es.l b/lang/es.l
index cd913567a..9248fa605 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -4908,12 +4908,12 @@ CHAN_HELP_ACCESS_LEVELS
 	para mayor informacion.
 
 CHAN_HELP_AKICK
-	Sintaxis: AKICK canal ADD mascara [razon]
-	          AKICK canal STICK mascara
-	          AKICK canal UNSTICK mascara
-	          AKICK canal DEL mascara
-	          AKICK canal LIST [mascara]
-	          AKICK canal VIEW [mascara]
+	Sintaxis: AKICK channel ADD {nick | mask} [reason]
+	          AKICK channel STICK mask
+	          AKICK channel UNSTICK mask
+	          AKICK channel DEL {nick | mask | entry-num | list}
+	          AKICK channel LIST [mask | entry-num | list]
+	          AKICK channel VIEW [mask | entry-num | list]
 	          AKICK canal ENFORCE
 	          AKICK canal CLEAR
 	
@@ -4927,6 +4927,9 @@ CHAN_HELP_AKICK
 	es dada con el comando, esta razon sera usada cuando el
 	usuario es kickeado; si no, la razon por defecto es
 	"Has sido baneado del canal".
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	El comando AKICK STICK banea permanente la mascara
 	dada en el canal. Si alguien intenta remover el ban,
diff --git a/lang/fr.l b/lang/fr.l
index ede04275a..97d17a5c7 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -4985,12 +4985,12 @@ CHAN_HELP_ACCESS_LEVELS
 	pour plus d'informations.
 
 CHAN_HELP_AKICK
-	Syntaxe: AKICK canal ADD masque [raison]
-	         AKICK canal STICK masque
-	         AKICK canal UNSTICK masque
-	         AKICK canal DEL masque
-	         AKICK canal LIST [masque]
-	         AKICK canal VIEW [masque]
+	Syntaxe: AKICK channel ADD {nick | masque} [raison]
+	         AKICK channel STICK masque
+	         AKICK channel UNSTICK masque
+	         AKICK channel DEL {nick | mask | entry-num | liste}
+	         AKICK channel LIST [masque | entry-num | liste]
+	         AKICK channel VIEW [masque | entry-num | liste]
 	         AKICK canal ENFORCE
 	         AKICK canal CLEAR
 	
@@ -5004,6 +5004,9 @@ CHAN_HELP_AKICK
 	raison est donnée avec la commande, cette raison sera utilisée 
 	lorsque l'utilisateur est kické, sinon, la raison par défaut est
 	"Vous n'ètes plus le bienvenue sur ce canal". 
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	La commande AKICK DEL supprime le pseudo ou le masque donné
 	de la liste de kicks automatiques. Cependant, il n'enlève pas 
diff --git a/lang/gr.l b/lang/gr.l
index a0d7bda47..9635c23fe 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -4888,14 +4888,14 @@ CHAN_HELP_ACCESS_LEVELS
 	ðëçñïöïñßåò.
 
 CHAN_HELP_AKICK
-	Óýíôáîç: AKICK êáíÜëé ADD ìÜóêá [ëüãïò]
-	        AKICK êáíÜëé STICK ìÜóêá
-	        AKICK êáíÜëé UNSTICK ìÜóêá
-	        AKICK êáíÜëé DEL ìÜóêá
-	        AKICK êáíÜëé LIST [ìÜóêá]
-	        AKICK êáíÜëé VIEW [ìÜóêá]
-	        AKICK êáíÜëé ENFORCE
-	        AKICK êáíÜëé CLEAR
+	Óýíôáîç: AKICK channel ADD {nick | mask} [reason]
+	         AKICK channel STICK mask
+	         AKICK channel UNSTICK mask
+	         AKICK channel DEL {nick | mask | entry-num | list}
+	         AKICK channel LIST [mask | entry-num | list]
+	         AKICK channel VIEW [mask | entry-num | list]
+	         AKICK êáíÜëé ENFORCE
+	         AKICK êáíÜëé CLEAR
 	
 	ÁëëÜæåé ôç ëßóôá áõôüìáôçò áðüññéøçò ãéá Ýíá êáíÜëé.
 	ÅÜí Ýíáò ÷ñÞóôçò ðïõ âñßóêåôáé óôç ëßóôá áõôüìáôçò áðüññéøçò,
diff --git a/lang/hun.l b/lang/hun.l
index d05ac53be..f6d385ed0 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -4808,12 +4808,12 @@ CHAN_HELP_ACCESS_LEVELS
 	információért.
 	
 CHAN_HELP_AKICK
-	Syntax: AKICK #szoba ADD maszk [indok]
+	Syntax: AKICK #szoba ADD {nick | maszk} [indok]
 	        AKICK #szoba STICK maszk
 	        AKICK #szoba UNSTICK maszk
-	        AKICK #szoba DEL maszk
-	        AKICK #szoba LIST [maszk]
-	        AKICK #szoba VIEW [maszk]
+	        AKICK #szoba DEL {nick | maszk | entry-num | list}
+	        AKICK #szoba LIST [maszk | entry-num | list]
+	        AKICK #szoba VIEW [maszk | entry-num | list]
 	        AKICK #szoba ENFORCE
 	        AKICK #szoba CLEAR
 	
diff --git a/lang/it.l b/lang/it.l
index c45ed1c4f..7af9dc49e 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -4820,12 +4820,12 @@ CHAN_HELP_ACCESS_LEVELS
 	%R%S HELP LEVELS per maggiori informazioni.
 
 CHAN_HELP_AKICK
-	Sintassi: AKICK canale ADD nick-mask [motivo]
+	Sintassi: AKICK canale ADD {nick | mask} [motivo]
 	          AKICK canale STICK mask
 	          AKICK canale UNSTICK mask
-	          AKICK canale DEL nick-mask
-	          AKICK canale LIST [mask]
-	          AKICK canale VIEW [mask]
+	          AKICK canale DEL {nick | mask | entry-num | list}
+	          AKICK canale LIST [mask | entry-num | list]
+	          AKICK canale VIEW [mask | entry-num | list]
 	          AKICK canale ENFORCE
 	          AKICK canale CLEAR
 	
@@ -4839,6 +4839,9 @@ CHAN_HELP_AKICK
 	verrà utilizzata la frase standard ""You have been banned from
 	the channel". In alternativa al nick può essere usata una
 	hostmask.
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	Il comando AKICK STICK mantiene permanentemente il ban
 	sulla mask specificata. Se qualcuno cerca di rimuovere il ban,
diff --git a/lang/nl.l b/lang/nl.l
index 4c7c216fa..465a64eeb 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -4843,12 +4843,12 @@ CHAN_HELP_ACCESS_LEVELS
 	%R%S HELP LEVELS voor meer informatie.
 
 CHAN_HELP_AKICK
-	Gebruik: AKICK kanaal ADD mask [reden]
-	         AKICK kanaal STICK mask
-	         AKICK kanaal UNSTICK mask
-	         AKICK kanaal DEL mask
-	         AKICK kanaal LIST [mask]
-	         AKICK kanaal VIEW [mask]
+	Gebruik: AKICK channel ADD {nick | mask} [reden]
+	         AKICK channel STICK mask
+	         AKICK channel UNSTICK mask
+	         AKICK channel DEL {nick | mask | entry-num | lijst}
+	         AKICK channel LIST [mask | entry-num | lijst]
+	         AKICK channel VIEW [mask | entry-num | lijst]
 	         AKICK kanaal ENFORCE
 	         AKICK kanaal CLEAR
 	
@@ -4862,6 +4862,9 @@ CHAN_HELP_AKICK
 	met het commando zal die reden gebruikt worden om de gebruiker
 	te kicken; zo niet is de reden "You have been banned from the
 	channel".
+	Als een geregistreerde nick wordt toegevoegd, wordt de nickserv
+	account toegevoegd in plaats van de mask. Alle gebruikers binnen
+	deze groep zullen automatisch worden gekicked.
 	
 	Het AKICK STICK commando bant het gegeven mask permanent
 	op het kanaal. Als iemand de ban probeert te verwijderen
diff --git a/lang/pl.l b/lang/pl.l
index 7287f0168..73c379b0f 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -5227,12 +5227,12 @@ CHAN_HELP_ACCESS_LEVELS
 	uzyskaæ wiêcej informacji.
 
 CHAN_HELP_AKICK
-	Sk³adnia: AKICK kana³ ADD maska [powód]
+	Sk³adnia: AKICK kana³ ADD {nick | maska} [powód]
 	          AKICK kana³ STICK maska
-	          AKICK kana³ UNSTICK maska
-	          AKICK kana³ DEL maska
-	          AKICK kana³ LIST [maska]
-	          AKICK kana³ VIEW [maska]
+	          AKICK kana³ UNSTICK mask
+	          AKICK kana³ DEL {nick | maska | entry-num | list}
+	          AKICK kana³ LIST [maska | entry-num | list]
+	          AKICK kana³ VIEW [maska | entry-num | list]
 	          AKICK kana³ ENFORCE
 	          AKICK kana³ CLEAR
 	
@@ -5247,6 +5247,9 @@ CHAN_HELP_AKICK
 	u¿ytkownika dodanego do listy z kana³u, je¶li nie 
 	zostanie podany, u¿ywany bêdzie standardowy zwrot: 
 	You have been banned from channel.
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	Komenda AKICK STICK umo¿liwia permanentne 
 	dodanie podanej maski do banów na kanale. Za ka¿dym 
diff --git a/lang/pt.l b/lang/pt.l
index f871b5c16..c46e65946 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -4778,12 +4778,12 @@ CHAN_HELP_ACCESS_LEVELS
 	comando LEVELS; digite %R%S HELP LEVELS para informações.
 
 CHAN_HELP_AKICK
-	Sintaxe: AKICK canal ADD máscara [razão]
+	Sintaxe: AKICK canal ADD {nick | máscara} [razão]
 	         AKICK canal STICK máscara
 	         AKICK canal UNSTICK máscara
-	         AKICK canal DEL máscara
-	         AKICK canal LIST [máscara]
-	         AKICK canal VIEW [máscara]
+	         AKICK canal DEL {nick | máscara | entry-num | list}
+	         AKICK canal LIST [máscara | entry-num | list]
+	         AKICK canal VIEW [máscara | entry-num | list]
 	         AKICK canal ENFORCE
 	         AKICK canal CLEAR
 	
@@ -4797,6 +4797,9 @@ CHAN_HELP_AKICK
 	o comando, esta razão será usada quando o usuário for
 	kickado; se não, a razão padrão será "Você foi banido
 	deste canal".
+	When akicking a registered nick the nickserv account
+	will be added to the akick list instead of the mask.
+	All users within that nickgroup will then be akicked.
 	
 	O comando AKICK STICK bane permanentemente no canal
 	a máscara fornecida. Se alguém tentar remover o ban,
diff --git a/lang/ru.l b/lang/ru.l
index fe2dbeb82..760dc33a2 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -4738,12 +4738,12 @@ CHAN_HELP_ACCESS_LEVELS
 	ïîäðîáíîé èíôîðìàöèè.
 
 CHAN_HELP_AKICK
-	Ñèíòàêñèñ: AKICK #êàíàë ADD ìàñêà [ïðè÷èíà]
-	           AKICK #êàíàë STICK ìàñêà
-	           AKICK #êàíàë UNSTICK ìàñêà
-	           AKICK #êàíàë DEL ìàñêà
-	           AKICK #êàíàë LIST [ìàñêà]
-	           AKICK #êàíàë VIEW [ìàñêà]
+	Ñèíòàêñèñ: AKICK channel ADD {nick | mask} [reason]
+	           AKICK channel STICK mask
+	           AKICK channel UNSTICK mask
+	           AKICK channel DEL {nick | mask | entry-num | list}
+	           AKICK channel LIST [mask | entry-num | list]
+	           AKICK channel VIEW [mask | entry-num | list]
 	           AKICK #êàíàë ENFORCE
 	           AKICK #êàíàë CLEAR
 	
diff --git a/lang/tr.l b/lang/tr.l
index 130fdbc0e..8b705622e 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -4859,12 +4859,12 @@ CHAN_HELP_ACCESS_LEVELS
 	yazýn.
 
 CHAN_HELP_AKICK
-	Kullanýmý:  AKICK kanaladý ADD mask [sebep]
-	            AKICK kanaladi STICK mask
-	            AKICK kanaladi UNSTICK mask
-	            AKICK kanaladý DEL mask
-	            AKICK kanaladý LIST [mask]
-	            AKICK kanaladý VIEW [mask]
+	Kullanýmý:  AKICK channel ADD {nick | mask} [reason]
+	            AKICK channel STICK mask
+	            AKICK channel UNSTICK mask
+	            AKICK channel DEL {nick | mask | entry-num | list}
+	            AKICK channel LIST [mask | entry-num | list]
+	            AKICK channel VIEW [mask | entry-num | list]
 	            AKICK kanaladý ENFORCE
 	            AKICK kanaladý CLEAR
 	
diff --git a/version.log b/version.log
index 78209cbac..f165aee47 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1420"
+VERSION_BUILD="1421"
 
 # $Log$
 #
+#
+# BUILD : 1.7.21 (1421)
+# BUGS  : 879
+# NOTES : Updated help on ChanServ AKICK.
+#
 # BUILD : 1.7.21 (1420)
 # BUGS  : 882
 # NOTES : Replaces the static count in logon&oper -news by a reference to NewsCount. Also fixes a booboo in my first commit.