diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua
index ff8621fe97..f57491f410 100644
--- a/openstreetmap-carto.lua
+++ b/openstreetmap-carto.lua
@@ -16,6 +16,7 @@ local polygon_keys = {
     'building',
     'building:part',
     'club',
+    'golf',
     'harbour',
     'healthcare',
     'historic',
@@ -37,6 +38,7 @@ local polygon_keys = {
 
 -- Objects with any of the following key/value combinations will be treated as linestring
 local linestring_values = {
+    golf = {cartpath = true, hole = true, path = true}, 
     historic = {citywalls = true},
     leisure = {track = true, slipway = true},
     man_made = {breakwater = true, cutline = true, embankment = true, groyne = true, pipeline = true},