diff --git a/inc/layer-amenity-points.xml.inc b/inc/layer-amenity-points.xml.inc
index 0667302..c000767 100644
--- a/inc/layer-amenity-points.xml.inc
+++ b/inc/layer-amenity-points.xml.inc
@@ -442,7 +442,7 @@
     <StyleName>points</StyleName>
     <Datasource>
       <Parameter name="table">
-      (select way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
+      (select way,amenity,shop,tourism,highway,man_made,name,access,religion,waterway,lock,historic,leisure
       from &prefix;_point
       where amenity is not null
          or shop is not null
@@ -461,7 +461,7 @@
     <StyleName>points</StyleName>
     <Datasource>
       <Parameter name="table">
-      (select way,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure
+      (select way,amenity,shop,tourism,highway,man_made,name,access,religion,waterway,lock,historic,leisure
       from &prefix;_polygon
       where amenity is not null
          or shop is not null
diff --git a/osm.xml b/osm.xml
index 359b741..139a1ab 100644
--- a/osm.xml
+++ b/osm.xml
@@ -517,6 +517,11 @@
       &maxscale_zoom17;
       <TextSymbolizer size="10" fill="#aa66cc" fontset-name="book-fonts" halo-radius="1" wrap-width="10" placement="interior">[ref]</TextSymbolizer>
     </Rule>
+    <Rule>
+      <Filter>[name] != ''</Filter>
+      &maxscale_zoom17;
+      <TextSymbolizer size="10" fill="#000000" fontset-name="book-fonts" halo-radius="2" wrap-width="10" placement="interior" opacity=".85">[name]</TextSymbolizer>
+    </Rule>
 </Style>
 <Style name="tunnels-casing">
     <Rule>