Index: osm-map-features-z17.xml
===================================================================
--- osm-map-features-z17.xml	(revision 8790)
+++ osm-map-features-z17.xml	(working copy)
@@ -871,82 +871,108 @@
         <!-- Tunnels -->
         <rule e="way" k="tunnel" v="true|yes">
             <rule e="way" k="highway" v="steps">
-                <line class="tunnel-casing highway-steps-casing tunnel" mask-class="tunnel-core highway-steps-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-steps-casing tunnel" mask-class="tunnel-core highway-steps-core"/>
+                <line class="highway-steps-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="footway|footpath">
-                <line class="tunnel-casing highway-footway-casing tunnel" mask-class="tunnel-core highway-footway-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-footway-casing tunnel" mask-class="tunnel-core highway-footway-core"/>
+                <line class="highway-footway-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="pedestrian">
-                <line class="tunnel-casing highway-pedestrian-casing tunnel" mask-class="tunnel-core highway-pedestrian-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-pedestrian-casing tunnel" mask-class="tunnel-core highway-pedestrian-core"/>
+                <line class="highway-pedestrian-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="cycleway">
-                <line class="tunnel-casing highway-cycleway-casing tunnel" mask-class="tunnel-core highway-cycleway-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-cycleway-casing tunnel" mask-class="tunnel-core highway-cycleway-core"/>
+                <line class="highway-cycleway-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="bridleway">
-                <line class="tunnel-casing highway-bridleway-casing tunnel" mask-class="tunnel-core highway-bridleway-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-bridleway-casing tunnel" mask-class="tunnel-core highway-bridleway-core"/>
+                <line class="highway-bridleway-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="byway">
-                <line class="tunnel-casing highway-byway-1-casing tunnel" mask-class="tunnel-core highway-byway-1-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-byway-1-casing tunnel" mask-class="tunnel-core highway-byway-1-core"/>
+                <line class="highway-byway-1-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="track">
-                <line class="tunnel-casing highway-track-casing tunnel" mask-class="tunnel-core highway-track-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-track-casing tunnel" mask-class="tunnel-core highway-track-core"/>
+                <line class="highway-track-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="unsurfaced">
-                <line class="tunnel-casing highway-unsurfaced-casing tunnel" mask-class="tunnel-core highway-unsurfaced-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-unsurfaced-casing tunnel" mask-class="tunnel-core highway-unsurfaced-core"/>
+                <line class="highway-unsurfaced-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="service">
-                <line class="tunnel-casing highway-service-casing tunnel" mask-class="tunnel-core highway-service-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-service-casing tunnel" mask-class="tunnel-core highway-service-core"/>
+                <line class="highway-service-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="unclassified|residential|minor|tertiary|living_street">
-                <line class="tunnel-casing highway-unclassified-casing tunnel" mask-class="tunnel-core highway-unclassified-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-unclassified-casing tunnel" mask-class="tunnel-core highway-unclassified-core"/>
+                <line class="highway-unclassified-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="road">
-                <line class="tunnel-casing highway-unclassified-casing tunnel" mask-class="tunnel-core highway-road-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-unclassified-casing tunnel" mask-class="tunnel-core highway-road-core"/>
+                <line class="highway-unclassified-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="tertiary">
-                <line class="tunnel-casing highway-tertiary-casing tunnel" mask-class="tunnel-core highway-tertiary-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-tertiary-casing tunnel" mask-class="tunnel-core highway-tertiary-core"/>
+                <line class="highway-tertiary-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="secondary">
-                <line class="tunnel-casing highway-secondary-casing tunnel" mask-class="tunnel-core highway-secondary-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-secondary-casing tunnel" mask-class="tunnel-core highway-secondary-core"/>
+                <line class="highway-secondary-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="primary_link">
-                <line class="tunnel-casing highway-primary-link-casing tunnel" mask-class="tunnel-core highway-primary-link-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-primary-link-casing tunnel" mask-class="tunnel-core highway-primary-link-core"/>
+                <line class="highway-primary-link-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="trunk_link">
-                <line class="tunnel-casing highway-trunk-link-casing tunnel" mask-class="tunnel-core highway-trunk-link-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-trunk-link-casing tunnel" mask-class="tunnel-core highway-trunk-link-core"/>
+                <line class="highway-trunk-link-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="motorway_link">
-                <line class="tunnel-casing highway-motorway-link-casing tunnel" mask-class="tunnel-core highway-motorway-link-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-motorway-link-casing tunnel" mask-class="tunnel-core highway-motorway-link-core"/>
+                <line class="highway-motorway-link-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="primary">
-                <line class="tunnel-casing highway-primary-casing tunnel" mask-class="tunnel-core highway-primary-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-primary-casing tunnel" mask-class="tunnel-core highway-primary-core"/>
+                <line class="highway-primary-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="trunk">
-                <line class="tunnel-casing highway-trunk-casing tunnel" mask-class="tunnel-core highway-trunk-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-trunk-casing tunnel" mask-class="tunnel-core highway-trunk-core"/>
+                <line class="highway-trunk-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="highway" v="motorway">
-                <line class="tunnel-casing highway-motorway-casing tunnel" mask-class="tunnel-core highway-motorway-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing highway-motorway-casing tunnel" mask-class="tunnel-core highway-motorway-core"/>
+                <line class="highway-motorway-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="monorail">
-                <line class="tunnel-casing railway-monorail-casing tunnel" mask-class="tunnel-core railway-monorail-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-monorail-casing tunnel" mask-class="tunnel-core railway-monorail-core"/>
+                <line class="railway-monorail-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="preserved">
-                <line class="tunnel-casing railway-preserved-casing tunnel" mask-class="tunnel-core railway-preserved-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-preserved-casing tunnel" mask-class="tunnel-core railway-preserved-core"/>
+                <line class="railway-preserved-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="narrow_gauge">
-                <line class="tunnel-casing railway-narrow-gauge-casing tunnel" mask-class="tunnel-core railway-narrow-gauge-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-narrow-gauge-casing tunnel" mask-class="tunnel-core railway-narrow-gauge-core"/>
+                <line class="railway-narrow-gauge-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="tram">
-                <line class="tunnel-casing railway-tram-casing tunnel" mask-class="tunnel-core railway-tram-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-tram-casing tunnel" mask-class="tunnel-core railway-tram-core"/>
+                <line class="railway-tram-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="subway">
-                <line class="tunnel-casing railway-subway-casing tunnel" mask-class="tunnel-core railway-subway-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-subway-casing tunnel" mask-class="tunnel-core railway-subway-core"/>
+                <line class="railway-subway-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="light_rail|incline">
-                <line class="tunnel-casing railway-light-rail-casing tunnel" mask-class="tunnel-core railway-light-rail-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-light-rail-casing tunnel" mask-class="tunnel-core railway-light-rail-core"/>
+                <line class="railway-light-rail-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
             <rule e="way" k="railway" v="rail">
-                <line class="tunnel-casing railway-rail-casing tunnel" mask-class="tunnel-core railway-rail-1-core" suppress-markers-tag="tunnel"/>
+                <line class="tunnel-casing railway-rail-casing tunnel" mask-class="tunnel-core railway-rail-1-core"/>
+                <line class="railway-rail-casing highway-tunnel-ends" suppress-markers-tag="tunnel"/>
             </rule>
         </rule>
 
@@ -2149,8 +2175,6 @@
                 stroke-linecap: butt;
                 stroke-linejoin: round;
                 fill: none;
-                marker-start: url(#marker-tunnel-start);
-                marker-end: url(#marker-tunnel-end);
             }
 
             .tunnel-core {
@@ -3422,6 +3446,13 @@
                 fill: white;
             }
 
+            .highway-tunnel-ends {
+                stroke-opacity: 0;
+                fill: none;
+                marker-start: url(#marker-tunnel-start);
+                marker-end: url(#marker-tunnel-end);
+             }
+
             /* Osmarender built-in styles - do not remove */
             .osmarender-stroke-linecap-round { stroke-linecap: round; }
             .osmarender-stroke-linecap-butt { stroke-linecap: butt; }
Index: osmarender.xsl
===================================================================
--- osmarender.xsl	(revision 8790)
+++ osmarender.xsl	(working copy)
@@ -412,9 +412,7 @@ Foundation, Inc., 59 Temple Place, Suite
       </xsl:attribute>
       <!-- If there is a mask class then include the mask attribute -->
       <xsl:if test='$instruction/@mask-class'>
-        <xsl:attribute name="mask">
-          url(#<xsl:value-of select="$maskId"/>)
-        </xsl:attribute>
+        <xsl:attribute name="mask">url(#<xsl:value-of select="$maskId"/>)</xsl:attribute>
       </xsl:if>
       <xsl:call-template name="getSvgAttributesFromOsmTags"/>
     </use>