Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15594)
+++ trunk/data/validator/combinations.mapcss	(revision 15595)
@@ -269,4 +269,6 @@
 
 /* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+*[man_made=bridge][bridge=yes],
+*[man_made=tunnel][tunnel=yes],
 *[amenity=police][police],
 node[highway=crossing][crossing=no],
@@ -393,5 +395,5 @@
 
 /* {0} on suspicious object */
-*[tunnel  ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing],
+*[tunnel  ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=tunnel],
 *[bridge  ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=wildlife_crossing][man_made!=bridge][building!=bridge],
 *[psv     ][!highway][!railway][!waterway][barrier!=bollard][amenity !~ /^parking.*/],
Index: trunk/data/validator/ignoretags.cfg
===================================================================
--- trunk/data/validator/ignoretags.cfg	(revision 15594)
+++ trunk/data/validator/ignoretags.cfg	(revision 15595)
@@ -390,4 +390,5 @@
 K:service=irrigation
 K:man_made=mast
+K:man_made=tunnel
 K:amenity=childcare
 K:landuse=logging
