diff --git a/Changes b/Changes
index 0530d64af..0b08ddb28 100644
--- a/Changes
+++ b/Changes
@@ -47,6 +47,7 @@ Anope Version  S V N
 08/11 F Updated os_raw.c to show up as a 3rd party module.                [ #00]
 08/15 F CS OP now correctly works if there is only 1 user in the channel. [#922]
 08/17 F Various InspIRCd issues.                                          [#832]
+08/18 F CS GETKEY response.                                               [#880]
 
 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/Changes.lang b/Changes.lang
index c669859f1..823afd615 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -12,6 +12,7 @@ Anope Version  S V N
 	NICK_RECOVERED
 	NICK_LIST_SERVADMIN_SYNTAX
 	NICK_SERVADMIN_HELP_LIST
+	CHAN_GETKEY_KEY
 
 *** Del Strings:
 
diff --git a/lang/cat.l b/lang/cat.l
index 42b2ef3f5..cac07c8f5 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1697,7 +1697,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/de.l b/lang/de.l
index 56a1244e9..7112eb5e9 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1702,7 +1702,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	Der Channel %s hat keinen Schlüßel.
 CHAN_GETKEY_KEY
-	Schlüßel für den Channel %s ist %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/en_us.l b/lang/en_us.l
index af0837e54..8479532f5 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1666,7 +1666,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/es.l b/lang/es.l
index 964a4a605..dbc51edcb 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1697,7 +1697,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	El canal %s no tiene clave.
 CHAN_GETKEY_KEY
-	Clave para el canal %s es %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index f6d4ac98d..955fce044 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1707,7 +1707,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	Le canal %s n'a pas de clé.
 CHAN_GETKEY_KEY
-	La clé du canal %s est %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/gr.l b/lang/gr.l
index 300259bde..0e80ec57b 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1699,7 +1699,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/hun.l b/lang/hun.l
index 63d1f1b8c..d5a42060c 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1695,7 +1695,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/it.l b/lang/it.l
index 53d75a586..2f1566c87 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1676,7 +1676,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	Il canale %s non ha una key.
 CHAN_GETKEY_KEY
-	La key per il canale %s è %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/nl.l b/lang/nl.l
index f156743fb..add8ed0d7 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1693,7 +1693,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/pl.l b/lang/pl.l
index a5a4a09b1..1953eb74f 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1794,7 +1794,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/pt.l b/lang/pt.l
index f2a62ecf9..f7fb344c0 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -1686,7 +1686,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	O canal %s não tem key.
 CHAN_GETKEY_KEY
-	A Key do canal %s é %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/ru.l b/lang/ru.l
index 1f2bc7a53..f11317e73 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1666,7 +1666,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	Êàíàë %s íå èìååò êëþ÷à (no key).
 CHAN_GETKEY_KEY
-	Êëþ÷ äëÿ êàíàëà %s - %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/lang/tr.l b/lang/tr.l
index c6b3c2a28..0e4b55c85 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1694,7 +1694,7 @@ CHAN_GETKEY_SYNTAX
 CHAN_GETKEY_NOKEY
 	The channel %s has no key.
 CHAN_GETKEY_KEY
-	Key for channel %s is %s.
+	KEY %s %s
 
 # SENDPASS responses
 CHAN_SENDPASS_SYNTAX
diff --git a/version.log b/version.log
index 3496440eb..3bba91fdd 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1415"
+VERSION_BUILD="1416"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1416)
+# BUGS  : 880
+# NOTES : Changed CS GETKEY response to what the help for GS GETKEY says it should be
+#
 # BUILD : 1.7.21 (1415)
 # BUGS  : 905
 # NOTES : Applied patch by Viper to add missing config file changes in Changes.conf