diff --git a/Changelog b/Changelog
index bb91143..7023f28 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* /MV (massvoice) shouldn't send +v for already-voiced users. (caf)
+
 * Fix lag check on recent 32 bit OpenBSD / NetBSD (reported by DJ). (caf)
 
 * Fix key bindings that terminate with ^. (caf)
diff --git a/source/banlist.c b/source/banlist.c
index c442b39..c141358 100644
--- a/source/banlist.c
+++ b/source/banlist.c
@@ -615,7 +615,7 @@ BUILT_IN_COMMAND(massop)
 		sprintf(buffer, "%s!%s", nicks->nick, nicks->host);
 		if ((my_stricmp(nicks->nick, get_server_nickname(from_server)) && wild_match(spec, buffer)))
 		{
-			if ((massvoice && !nick_isvoice(nicks) && !nick_isop(nicks)) || !nick_isop(nicks))
+			if (!(nick_isop(nicks) || (massvoice && nick_isvoice(nicks))))
 			{
 				add_mode(chan, massvoice?"v":"o", 1, nicks->nick, NULL, maxmodes);
 				count++;