diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c
index 071f2559..db0d4a8b 100644
--- a/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@ -1034,7 +1034,9 @@ int BSPMain( int argc, char **argv ){
 		/* if we are doing a full map, delete the last saved region map */
 		sprintf( path, "%s.reg", source );
 		remove( path );
-		path_set_extension( name, ".map" );   /* might be .reg */
+		if ( !onlyents || !striEqual( path_get_filename_base_end( name ), ".ent" ) ) {
+			path_set_extension( name, ".map" );   /* .reg and .ent are ok too */
+		}
 	}
 
 	/* if onlyents, just grab the entites and resave */