diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index faf154c90..c5d8784a7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ D1X-Rebirth Changelog
 main/fireball.c: made choose_drop_segment more similar to D2X-Rebirth and let fallback correctly check for reactor segment
 2d/font.c: made code more similar to D2X-Rebirth by introducing open_font which allows to keep track of font_data and free it properly
 2d/font.c, misc/strutil.c: removed redundant definitions of FILENAME_LEN
+main/multi.c, main/multi.h: fixed glitch when reappear and explode packets are misordered, rendering player invisible
 
 20120405
 --------
diff --git a/main/multi.c b/main/multi.c
index 80e04781e..7528fa537 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -118,6 +118,7 @@ unsigned char multibuf2[MAX_MULTI_MESSAGE_LEN+4];
 short remote_to_local[MAX_NUM_NET_PLAYERS][MAX_OBJECTS];  // Remote object number for each local object
 short local_to_remote[MAX_OBJECTS]; 
 sbyte  object_owner[MAX_OBJECTS];   // Who created each object in my universe, -1 = loaded at start
+int early_resp[MAX_NUM_NET_PLAYERS]; // HACK in case we ger REAPPEAR packet before EXPLODE
 
 int 	Net_create_objnums[MAX_NET_CREATE_OBJECTS]; // For tracking object creation that will be sent to remote
 int 	Net_create_loc = 0;  // pointer into previous array
@@ -164,7 +165,7 @@ extern fix ThisLevelTime;
 
 int message_length[MULTI_MAX_TYPE+1] = {
         25, // POSITION
-        3,  // REAPPEAR
+        4,  // REAPPEAR
         8,  // FIRE
         5,  // KILL
         4,  // REMOVE_OBJECT
@@ -1500,15 +1501,23 @@ void
 multi_do_reappear(char *buf)
 {
 	short objnum;
+	ubyte pnum = buf[1];
 
-	objnum = GET_INTEL_SHORT(buf + 1);
+	objnum = GET_INTEL_SHORT(buf + 2);
 
 	Assert(objnum >= 0);
 
+	if (Objects[Players[pnum].objnum].type != OBJ_GHOST)
+	{
+		early_resp[pnum] = objnum;
+		return;
+	}
+
 	multi_make_ghost_player(Objects[objnum].id);
 
 	create_player_appearance_effect(&Objects[objnum]);
 	PKilledFlags[Objects[objnum].id]=0;
+	early_resp[pnum] = -1;
 }
 
 void
@@ -1602,6 +1611,13 @@ multi_do_player_explode(char *buf)
 
 	Players[pnum].flags &= ~(PLAYER_FLAGS_CLOAKED | PLAYER_FLAGS_INVULNERABLE);
 	Players[pnum].cloak_time = 0;
+
+	if (early_resp[pnum] >= 0)
+	{
+		multi_make_ghost_player(Objects[early_resp[pnum]].id);
+		create_player_appearance_effect(&Objects[early_resp[pnum]]);
+		early_resp[pnum] = -1;
+	}
 }
 
 /*
@@ -2590,9 +2606,10 @@ multi_send_reappear()
 	multi_send_position(Players[Player_num].objnum);
 	
 	multibuf[0] = (char)MULTI_REAPPEAR;
-	PUT_INTEL_SHORT(multibuf+1, Players[Player_num].objnum);
+	multibuf[1] = (char)Player_num;
+	PUT_INTEL_SHORT(multibuf+2, Players[Player_num].objnum);
 
-	multi_send_data(multibuf, 3, 2);
+	multi_send_data(multibuf, 4, 2);
 	PKilledFlags[Player_num]=0;
 }
 
@@ -2982,6 +2999,7 @@ multi_prep_level(void)
 
 	for (i=0;i<MAX_NUM_NET_PLAYERS;i++)
 	{
+		early_resp[i] = -1;
 		PKilledFlags[i]=0;
 		multi_sending_message[i] = 0;
 	}
diff --git a/main/multi.h b/main/multi.h
index 5a8707837..7e2241f76 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -73,7 +73,7 @@ extern int multi_protocol; // set and determinate used protocol
 //   3 Descent II Shareware
 //   4 Descent II Commercial
 // > 4 DXX-Rebirth
-#define MULTI_PROTO_VERSION 6
+#define MULTI_PROTO_VERSION 7
 // PROTOCOL VARIABLES AND DEFINES - END