diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index a3353110..0833bf98 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_shared.h"
 #include "../server/server.h"
+#include "../qcommon/q_version.h"
 #include "sv_gqueryreporting.h"
 #include "sv_gamespy.h"
 
@@ -64,16 +65,16 @@ static const char *GS_GAME_NAME_DEMO[] =
 
 static const char *GS_GAME_VERSION[] =
 {
-    TARGET_GAME_VERSION_MOH,
-    TARGET_GAME_VERSION_MOHTA,
-    TARGET_GAME_VERSION_MOHTT,
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTT "+" PRODUCT_VERSION,
 };
 
 static const char* GS_GAME_VERSION_DEMO[] =
 {
-    TARGET_GAME_VERSION_MOH,
-    "d" TARGET_GAME_VERSION_MOHTA,
-    "d" TARGET_GAME_VERSION_MOHTT_DEMO,
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTT_DEMO "+" PRODUCT_VERSION,
 };
 
 static const unsigned int GAMESPY_DEFAULT_PORT = 12300;
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 4eb6322e..044855c8 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -3128,7 +3128,7 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH_DEMO));
         }
 		protocol_version_demo = protocol_version_full = PROTOCOL_MOH;
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOH);
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOH, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOH);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOH);
 		// "main" is already used as first argument of FS_Startup
@@ -3145,7 +3145,7 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 		}
 		protocol_version_demo = PROTOCOL_MOHTA_DEMO;
 		protocol_version_full = PROTOCOL_MOHTA;
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTA);
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTA, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTA);
 		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTA);
 		if (!bIsDemo) {
@@ -3162,12 +3162,12 @@ void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
 			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
             Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
             Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA_DEMO));
-            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT, PRODUCT_VERSION));
 		} else {
 			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
             Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
             Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
-            Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT_DEMO);
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT_DEMO, PRODUCT_VERSION));
         }
         protocol_version_demo = PROTOCOL_MOHTA_DEMO;
         protocol_version_full = PROTOCOL_MOHTA;
diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 4d1ee4bc..a83621da 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -292,7 +292,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		if (bits&7) {
 			int nbits;
 			nbits = bits&7;
-			if ( msg->bit + nbits > msg->maxsize << 3 ) {
+			if ( msg->bit + nbits >= msg->maxsize << 3 ) {
 				msg->overflowed = qtrue;
 				return;
 			}
@@ -307,7 +307,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 				Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit, msg->maxsize << 3 );
 				value = (value>>8);
 
-				if ( msg->bit > msg->maxsize << 3 ) {
+				if ( msg->bit >= msg->maxsize << 3 ) {
 					msg->overflowed = qtrue;
 					return;
 				}