diff --git a/src/p_setup.c b/src/p_setup.c
index 45a5442ff02c1fc75447b8f9a82927ed2962494c..497bba4458c6981ad7df4d3a09d4e77937792edf 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2003,16 +2003,16 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count, const char *lumpname
 	return false;
 #else
 	// Check if the lump is named "BLOCKMAP"
-	if (!lumpname || !memcmp(lumpname, "BLOCKMAP", 8) != 0)
+	if (!lumpname || memcmp(lumpname, "BLOCKMAP", 8) != 0)
 	{
-		CONS_Printf("No blockmap lump found for pk3!");
+		CONS_Printf("No blockmap lump found for pk3!\n");
 		return false;
 	}
 
 	if (!count || count >= 0x20000)
 		return false;
 
-	CONS_Printf("Reading blockmap lump for pk3...");
+	CONS_Printf("Reading blockmap lump for pk3...\n");
 
 	// no need to malloc anything, assume the data is uncompressed for now
 	count /= 2;
diff --git a/src/p_spec.c b/src/p_spec.c
index 797aba049cef29e9622e4f55d60dfe79ad6ca1cc..498ebcf7d2c2bce8a71be72fe4db9be975296c15 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -6305,8 +6305,21 @@ void P_SpawnSpecials(INT32 fromnetsave)
 			case 259: // Make-Your-Own FOF!
 				if (lines[i].sidenum[1] != 0xffff)
 				{
-					UINT8 *data = W_CacheLumpNum(lastloadedmaplumpnum + ML_SIDEDEFS,PU_STATIC);
+					UINT8 *data;
 					UINT16 b;
+					char *lumpfullName = (wadfiles[WADFILENUM(lastloadedmaplumpnum)]->lumpinfo + LUMPNUM(lastloadedmaplumpnum))->name2;
+
+					if (!strnicmp(lumpfullName + strlen(lumpfullName) - 4, ".wad", 4)) // welp it's a map wad in a pk3
+					{ // HACK: Open wad file rather quickly so we can get the data from the sidedefs lump
+						UINT8 *wadData = W_CacheLumpNum(lastloadedmaplumpnum, PU_STATIC);
+						filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
+						fileinfo += ML_SIDEDEFS; // we only need the SIDEDEFS lump
+						data = Z_Malloc(fileinfo->size, PU_STATIC, NULL);
+						M_Memcpy(data, wadData + fileinfo->filepos, fileinfo->size); // copy data
+						Z_Free(wadData); // we're done with this now
+					}
+					else // phew it's just a WAD
+						data = W_CacheLumpNum(lastloadedmaplumpnum + ML_SIDEDEFS,PU_STATIC);
 
 					for (b = 0; b < (INT16)numsides; b++)
 					{