diff --git a/amenity-points.mss b/amenity-points.mss
index cb970b73a9..01e399e3c0 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -72,7 +72,7 @@
     marker-placement: interior;
     marker-clip: false;
   }
-  
+
   [feature = 'amenity_bbq'][zoom >= 17] {
     marker-file: url('symbols/bbq.svg');
     marker-fill: @amenity-brown;
@@ -159,7 +159,7 @@
     marker-clip: false;
   }
 
-  // Ford tagging on points - ford on lines is defined later 
+  // Ford tagging on points - ford on lines is defined later
   [feature = 'highway_ford'][zoom >= 16] {
     marker-file: url('symbols/ford.svg');
     marker-fill: @transportation-icon;
@@ -313,13 +313,20 @@
     marker-clip: false;
   }
 
-  [feature = 'tourism_information'][zoom >= 17] {
+  [feature = 'tourism_information'][information != 'guidepost'][zoom >= 17] {
     marker-file: url('symbols/information.12.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
+  [feature = 'tourism_information'][information = 'guidepost'][zoom >= 19] {
+    marker-file: url('symbols/guidepost.svg');
+    marker-placement: interior;
+    marker-fill: @amenity-brown;
+    marker-clip: false;
+  }
+
   [feature = 'amenity_embassy'][zoom >= 17] {
     marker-file: url('symbols/embassy.svg');
     marker-fill: @public-service;
@@ -347,7 +354,7 @@
     marker-placement: interior;
     marker-clip: false;
   }
-  
+
   [feature = 'amenity_shower'][zoom >= 18] {
     marker-file: url('symbols/shower.svg');
     marker-fill: @amenity-brown;
@@ -374,7 +381,7 @@
     [zoom >= 16][height > 40],
     [zoom >= 17][height > 20],
     [zoom >= 18] {
-      ["tower:type" != 'lighting'] {  
+      ["tower:type" != 'lighting'] {
         marker-file: url('symbols/towers/mast.svg');
         marker-fill: @man-made-icon;
         marker-placement: interior;
@@ -385,7 +392,7 @@
         marker-fill: @man-made-icon;
         marker-placement: interior;
         marker-clip: false;
-      }      
+      }
       ["tower:type" = 'communication'] {
         marker-file: url('symbols/towers/mast_communications.svg');
       }
@@ -404,10 +411,10 @@
       marker-placement: interior;
       marker-clip: false;
       ["tower:type" = 'defensive'] {
-        marker-file: url('symbols/towers/tower_defensive.svg');  
+        marker-file: url('symbols/towers/tower_defensive.svg');
       }
       ["tower:type" = 'observation'] {
-        marker-file: url('symbols/towers/tower_observation.svg');  
+        marker-file: url('symbols/towers/tower_observation.svg');
       }
       ["tower:type" = 'bell_tower'] {
         marker-file: url('symbols/towers/bell_tower.svg');
@@ -417,7 +424,7 @@
         ["tower:construction" = 'lattice'] {
           marker-file: url('symbols/towers/tower_lattice_lighting.svg');
         }
-      }      
+      }
       ["tower:construction" = 'lattice'] {
         marker-file: url('symbols/towers/tower_lattice.svg');
       }
@@ -534,7 +541,7 @@
     marker-placement: interior;
     marker-clip: false;
   }
-    
+
   [feature = 'amenity_police'][zoom >= 16] {
     marker-file: url('symbols/police.svg');
     marker-fill: @public-service;
@@ -1096,7 +1103,7 @@
     marker-placement: interior;
     marker-clip: false;
   }
-  
+
   [feature = 'leisure_firepit'][zoom >= 17] {
     marker-file: url('symbols/firepit.svg');
     marker-fill: @amenity-brown;
@@ -1118,7 +1125,7 @@
      marker-clip: false;
    }
 
-  // Slipway tagging on points - slipway on lines is defined later 
+  // Slipway tagging on points - slipway on lines is defined later
   [feature = 'leisure_slipway'][zoom >= 17] {
     marker-file: url('symbols/transport_slipway.p.20.svg');
     marker-fill: @transportation-icon;
@@ -1196,10 +1203,10 @@
 
   [feature = 'military_bunker'][zoom >= 17] {
     marker-file: url('symbols/bunker.svg');
-    marker-fill: @man-made-icon;    
+    marker-fill: @man-made-icon;
     marker-placement: interior;
     marker-clip: false;
-  }  
+  }
 
   [feature = 'natural_spring'][zoom >= 14] {
     marker-file: url('symbols/spring.svg');
@@ -1230,8 +1237,8 @@
     marker-placement: interior;
     marker-clip: false;
   }
-  
-  // waste_disposal tagging on ways - tagging on nodes is defined later 
+
+  // waste_disposal tagging on ways - tagging on nodes is defined later
   [feature = 'amenity_waste_disposal'][zoom >= 19] {
     [access = null],
     [access = 'permissive'],
@@ -1330,7 +1337,7 @@
     marker-placement: interior;
   }
 
-  // waste_disposal tagging on nodes - tagging on ways is defined earlier 
+  // waste_disposal tagging on nodes - tagging on ways is defined earlier
   [feature = 'amenity_waste_disposal'][zoom >= 19]::amenity {
     [access = null],
     [access = 'permissive'],
@@ -1646,7 +1653,7 @@
     text-halo-fill: @standard-halo-fill;
     text-placement: interior;
   }
-  
+
   [feature = 'military_bunker'][zoom >= 17],
   [feature = 'historic_wayside_shrine'][zoom >= 17] {
     text-name: "[name]";
@@ -2033,7 +2040,7 @@
       text-dy: 6;
     }
   }
-  
+
   [feature = 'amenity_shower'][zoom >= 18] {
     text-name: "[name]";
     text-size: @standard-font-size;
diff --git a/project.mml b/project.mml
index 47bdc85931..1076ca8c82 100644
--- a/project.mml
+++ b/project.mml
@@ -1478,6 +1478,7 @@ Layer:
             tags->'icao' as icao,
             tags->'iata' as iata,
             tags->'office' as office,
+            tags->'information' as information,
             tags->'recycling_type' as recycling_type,
             tags->'tower:construction' as "tower:construction",
             tags->'tower:type' as "tower:type",
@@ -1606,6 +1607,7 @@ Layer:
             tags->'icao' as icao,
             tags->'iata' as iata,
             tags->'office' as office,
+            tags->'information' as information,
             tags->'recycling_type' as recycling_type,
             tags->'tower:construction' as "tower:construction",
             tags->'tower:type' as "tower:type",
diff --git a/symbols/guidepost.svg b/symbols/guidepost.svg
new file mode 100644
index 0000000000..918a90ba9b
--- /dev/null
+++ b/symbols/guidepost.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0.25 C 6.625,0.25 6.25,0.5 6.25,1 l 0,13 1.5,0 0,-13 C 7.75,0.5 7.375,0.25 7,0.25 z M 2,1 0,2.5 2,4 6,4 6,1 2,1 z M 8,4 8,7 12,7 14,5.5 12,4 8,4 z"
+     id="guidepost"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>