diff --git a/docs/Complete_list_of_entity_keys.htm b/docs/Complete_list_of_entity_keys.htm
index 7fcf6d39..6ff39fd6 100644
--- a/docs/Complete_list_of_entity_keys.htm
+++ b/docs/Complete_list_of_entity_keys.htm
@@ -222,7 +222,7 @@ td.formatted_questions ol { margin-top: 0px; margin-bottom: 0px; }
 		<li><strong><code>spawnflags</code>:</strong>  8 = when generating clipping planes, perform extrusion using the original normals from the model instead of per-triangle best axial normals</li>
 		<li><strong><code>spawnflags</code>:</strong> 16 = when generating clipping planes, perform extrusion using only up or down pointing normals (ideal for terrain)</li>
 		<li><strong><code>spawnflags</code>:</strong> 32 = turn vertex color from the model into alpha (for terrain blending)</li>
-		<li><strong><code>target</code>:</strong> points to brush entity to bake the model into</li>
+		<li><strong><code>target</code>, <code>_target</code>:</strong> points to brush entity with any of matching <strong><code>targetname</code></strong>/<strong><code>_targetname</code></strong> keys to bake the model into</li>
 	</ul>
 	</li>
 		<li>On classname <strong><code>_skybox</code></strong>
diff --git a/tools/quake3/q3map2/model.cpp b/tools/quake3/q3map2/model.cpp
index b13fde36..10b933df 100644
--- a/tools/quake3/q3map2/model.cpp
+++ b/tools/quake3/q3map2/model.cpp
@@ -1274,7 +1274,7 @@ void AddTriangleModels( entity_t& eparent ){
 		targetName = "";
 	}
 	else{  /* misc_model entities target non-worldspawn brush model entities */
-		if ( !eparent.read_keyvalue( targetName, "targetname" ) ) {
+		if ( !eparent.read_keyvalue( targetName, "_targetname", "targetname" ) ) {
 			return;
 		}
 	}
@@ -1291,7 +1291,7 @@ void AddTriangleModels( entity_t& eparent ){
 		}
 
 		/* ydnar: added support for md3 models on non-worldspawn models */
-		if ( !strEqual( e.valueForKey( "target" ), targetName ) ) {
+		if ( const char *target = ""; e.read_keyvalue( target, "_target", "target" ), !strEqual( target, targetName ) ) {
 			continue;
 		}