diff --git a/data/presets.yaml b/data/presets.yaml
index c51e7f086..c7dd1c901 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2347,6 +2347,10 @@ en:
         name: Airport Terminal
         # 'terms: airport,aerodrome'
         terms: '<translate with synonyms or related terms for ''Airport Terminal'', separated by commas>'
+      aeroway/windsock:
+        # aeroway=windsock
+        name: Windsock
+        terms: '<translate with synonyms or related terms for ''Windsock'', separated by commas>'
       allotments/plot:
         # allotments=plot
         name: Community Garden Plot
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 396116250..80842ff5f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -45,6 +45,7 @@
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
     "aeroway/taxiway": {"geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"},
     "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["wheelchair", "smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
+    "aeroway/windsock": {"icon": "fas-wind", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"},
     "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"},
     "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"},
     "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false},
diff --git a/data/presets/presets/aeroway/windsock.json b/data/presets/presets/aeroway/windsock.json
new file mode 100644
index 000000000..1768dfa22
--- /dev/null
+++ b/data/presets/presets/aeroway/windsock.json
@@ -0,0 +1,19 @@
+{
+    "icon": "fas-wind",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "fields": [
+        "ref",
+        "lit",
+        "height"
+    ],
+    "moreFields": [
+        "manufacturer"
+    ],
+    "tags": {
+        "aeroway": "windsock"
+    },
+    "name": "Windsock"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 90b195393..2e88ae143 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -48,6 +48,7 @@
     {"key": "aeroway", "value": "runway", "description": "🄿 Runway", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-plane-departure.svg?sanitize=true"},
     {"key": "aeroway", "value": "taxiway", "description": "🄿 Taxiway", "object_types": ["way"]},
     {"key": "aeroway", "value": "terminal", "description": "🄿 Airport Terminal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/airport-15.svg?sanitize=true"},
+    {"key": "aeroway", "value": "windsock", "description": "🄿 Windsock", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-wind.svg?sanitize=true"},
     {"key": "allotments", "value": "plot", "description": "🄿 Community Garden Plot", "object_types": ["area"]},
     {"key": "amenity", "value": "bus_station", "description": "🄿 Bus Station / Terminal (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"},
     {"key": "amenity", "value": "coworking_space", "description": "🄿 Coworking Space (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/commercial-15.svg?sanitize=true"},
@@ -1688,6 +1689,7 @@
     {"key": "windings:configuration", "value": "scott", "description": "🄵 Windings Configuration"},
     {"key": "windings:configuration", "value": "leblanc", "description": "🄵 Windings Configuration"},
     {"key": "aerialway", "value": "canopy", "description": "🄳 ➜ aerialway=zip_line"},
+    {"key": "aeroway", "value": "aerobridge", "description": "🄳 ➜ aeroway=jet_bridge"},
     {"key": "amenity", "value": "advertising", "description": "🄳 ➜ advertising=*"},
     {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"},
     {"key": "amenity", "value": "car_repair", "description": "🄳 ➜ shop=car_repair"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c0ad14e69..1e7f9ae95 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4242,6 +4242,10 @@
                     "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "aeroway/windsock": {
+                    "name": "Windsock",
+                    "terms": ""
+                },
                 "allotments/plot": {
                     "name": "Community Garden Plot",
                     "terms": ""
diff --git a/svg/fontawesome/fas-wind.svg b/svg/fontawesome/fas-wind.svg
new file mode 100644
index 000000000..aba9ee006
--- /dev/null
+++ b/svg/fontawesome/fas-wind.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="wind" class="svg-inline--fa fa-wind fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M156.7 256H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h142.2c15.9 0 30.8 10.9 33.4 26.6 3.3 20-12.1 37.4-31.6 37.4-14.1 0-26.1-9.2-30.4-21.9-2.1-6.3-8.6-10.1-15.2-10.1H81.6c-9.8 0-17.7 8.8-15.9 18.4 8.6 44.1 47.6 77.6 94.2 77.6 57.1 0 102.7-50.1 95.2-108.6C249 291 205.4 256 156.7 256zM16 224h336c59.7 0 106.8-54.8 93.8-116.7-7.6-36.2-36.9-65.5-73.1-73.1-55.4-11.6-105.1 24.9-114.9 75.5-1.9 9.6 6.1 18.3 15.8 18.3h32.8c6.7 0 13.1-3.8 15.2-10.1C325.9 105.2 337.9 96 352 96c19.4 0 34.9 17.4 31.6 37.4-2.6 15.7-17.4 26.6-33.4 26.6H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16zm384 32H243.7c19.3 16.6 33.2 38.8 39.8 64H400c26.5 0 48 21.5 48 48s-21.5 48-48 48c-17.9 0-33.3-9.9-41.6-24.4-2.9-5-8.7-7.6-14.5-7.6h-33.8c-10.9 0-19 10.8-15.3 21.1 17.8 50.6 70.5 84.8 129.4 72.3 41.2-8.7 75.1-41.6 84.7-82.7C526 321.5 470.5 256 400 256z"></path></svg>
\ No newline at end of file