diff --git a/data/presets/categories.json b/data/presets/categories.json
index c1a7c16a0..cfead76e5 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -29,7 +29,7 @@
         "building/residential"
       ]
     },
-    "category-golf": {
+    "category-golf-area": {
       "icon": "maki-golf",
       "geometry": "area",
       "name": "Golf Features",
@@ -40,7 +40,19 @@
         "golf/rough",
         "golf/bunker",
         "golf/tee",
-        "golf/water_hazard_area"
+        "golf/water_hazard_area",
+        "golf/driving_range"
+      ]
+    },
+    "category-golf-line": {
+      "icon": "maki-golf",
+      "geometry": "line",
+      "name": "Golf Features",
+      "members": [
+        "golf/hole",
+        "golf/cartpath",
+        "golf/cartpath_multipurpose",
+        "golf/path"
       ]
     },
     "category-landuse": {
diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf-area.json
similarity index 80%
rename from data/presets/categories/golf.json
rename to data/presets/categories/golf-area.json
index 0416577f8..eb00ffcd8 100644
--- a/data/presets/categories/golf.json
+++ b/data/presets/categories/golf-area.json
@@ -9,6 +9,7 @@
         "golf/rough",
         "golf/bunker",
         "golf/tee",
-        "golf/water_hazard_area"
+        "golf/water_hazard_area",
+        "golf/driving_range"
     ]
 }
diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json
new file mode 100644
index 000000000..dc7623c84
--- /dev/null
+++ b/data/presets/categories/golf-line.json
@@ -0,0 +1,11 @@
+{
+    "icon": "maki-golf",
+    "geometry": "line",
+    "name": "Golf Features",
+    "members": [
+        "golf/hole",
+        "golf/cartpath",
+        "golf/cartpath_multipurpose",
+        "golf/path"
+    ]
+}
diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json
new file mode 100644
index 000000000..323a8ec24
--- /dev/null
+++ b/data/presets/presets/golf/cartpath.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "surface",
+        "width",
+        "structure",
+        "access",
+        "incline"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "cartpath",
+        "golf_cart": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "cartpath"
+    },
+    "name": "Golf Cartpath"
+}
diff --git a/data/presets/presets/golf/cartpath_multipurpose.json b/data/presets/presets/golf/cartpath_multipurpose.json
new file mode 100644
index 000000000..cabc31cb5
--- /dev/null
+++ b/data/presets/presets/golf/cartpath_multipurpose.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "surface",
+        "width",
+        "structure",
+        "access",
+        "incline"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "service",
+        "golf": "cartpath",
+        "golf_cart": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "cartpath"
+    },
+    "name": "Golf Cartpath Multipurpose"
+}
diff --git a/data/presets/presets/golf/driving_range.json b/data/presets/presets/golf/driving_range.json
new file mode 100644
index 000000000..6a7cb955b
--- /dev/null
+++ b/data/presets/presets/golf/driving_range.json
@@ -0,0 +1,18 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "golf": "driving_range",
+        "landuse": "grass"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "driving_range"
+    },
+    "name": "Driving Range"
+}
diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json
new file mode 100644
index 000000000..7c6b5c9a3
--- /dev/null
+++ b/data/presets/presets/golf/path.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "surface",
+        "width",
+        "structure",
+        "access",
+        "incline"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "path",
+        "foot": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "path"
+    },
+    "name": "Golf Walking Path"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 39d613059..ad4cbd770 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -375,9 +375,11 @@
     {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"},
     {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"]},
     {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
-    {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Driving Range, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "golf", "value": "cartpath", "description": "🄿 Golf CartPath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "golf", "value": "path", "description": "🄿 Golf Walking Path", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},