diff --git a/src/compatibility.cpp b/src/compatibility.cpp
index f281f0ef2..947b7ffae 100644
--- a/src/compatibility.cpp
+++ b/src/compatibility.cpp
@@ -470,14 +470,6 @@ void CheckCompatibility(MapData *map)
 		ii_compatflags = COMPATF_SHORTTEX|COMPATF_LIGHT;
 		if (gameinfo.flags & GI_COMPATSTAIRS) ii_compatflags |= COMPATF_STAIRINDEX;
 	}
-	else if (Wads.GetLumpFile(map->lumpnum) == 1 && (gameinfo.flags & GI_COMPATPOLY1) && Wads.CheckLumpName(map->lumpnum, "MAP36"))
-	{
-		ii_compatflags = COMPATF_POLYOBJ;
-	}
-	else if (Wads.GetLumpFile(map->lumpnum) == 2 && (gameinfo.flags & GI_COMPATPOLY2) && Wads.CheckLumpName(map->lumpnum, "MAP47"))
-	{
-		ii_compatflags = COMPATF_POLYOBJ;
-	}
 
 	map->GetChecksum(md5.Bytes);
 
diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt
index 173aa10d1..aafdd9a37 100644
--- a/wadsrc/static/compatibility.txt
+++ b/wadsrc/static/compatibility.txt
@@ -763,3 +763,9 @@ CA3773ED313E8899311F3DD0CA195A68 // e3m6
 	setsectorlight 138 192
 	setwalltexture 3431 back top BRKGRY01
 }
+
+3FFAF2F624C1B4BB6F581DCF7B99CBA7 // hexen.wad MAP36
+7DC65D5029DD834481CD716B3D71388A // hexdd.wad MAP47
+{
+	polyobj
+}