diff --git a/Changes b/Changes
index 13d3ed2d3..5023db023 100644
--- a/Changes
+++ b/Changes
@@ -89,3 +89,4 @@
 - X:line was replaced with drpass {} in /restart and /die (will make them faster as well)
 - Made +u do a auditorium/star chat feature, suggested by |Martin|=======
 - Fixed a G:line bug that would allow certain masks to be interpreted as *@*
+- Fixed the same bug in shun that affected G:line
diff --git a/src/s_kline.c b/src/s_kline.c
index c06853810..7b521f07b 100644
--- a/src/s_kline.c
+++ b/src/s_kline.c
@@ -1032,7 +1032,7 @@ int  m_shun(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
       nochecks:
 	usermask = strtok(mask, "@");
-	hostmask = strtok(NULL, "@");
+	hostmask = strtok(NULL, "");
 	tkl_check_expire();
 
 	for (tk = tklines; tk; tk = tk->next)