diff --git a/data/presets.yaml b/data/presets.yaml
index 9107eb177..52e474cf6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3256,6 +3256,11 @@ en:
         name: Golf Course
         # 'terms: links'
         terms: '<translate with synonyms or related terms for ''Golf Course'', separated by commas>'
+      leisure/hackerspace:
+        # leisure=hackerspace
+        name: Hackerspace
+        # 'terms: makerspace,hackspace,hacklab'
+        terms: '<translate with synonyms or related terms for ''Hackerspace'', separated by commas>'
       leisure/horse_riding:
         # leisure=horse_riding
         name: Horseback Riding Facility
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 69400532e..393638f45 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8456,6 +8456,26 @@
             },
             "name": "Golf Course"
         },
+        "leisure/hackerspace": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "website"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "makerspace",
+                "hackspace",
+                "hacklab"
+            ],
+            "tags": {
+                "leisure": "hackerspace"
+            },
+            "name": "Hackerspace"
+        },
         "leisure/horse_riding": {
             "icon": "horse-riding",
             "fields": [
diff --git a/data/presets/presets/leisure/hackerspace.json b/data/presets/presets/leisure/hackerspace.json
new file mode 100644
index 000000000..955b9f178
--- /dev/null
+++ b/data/presets/presets/leisure/hackerspace.json
@@ -0,0 +1,20 @@
+{
+    "icon": "commercial",
+    "fields": [
+        "name",
+        "address",
+        "website"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "makerspace",
+        "hackspace",
+        "hacklab"
+    ],
+    "tags": {
+        "leisure": "hackerspace"
+    },
+    "name": "Hackerspace"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 9439b50de..01c8c176c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1638,6 +1638,10 @@
             "key": "leisure",
             "value": "golf_course"
         },
+        {
+            "key": "leisure",
+            "value": "hackerspace"
+        },
         {
             "key": "leisure",
             "value": "horse_riding"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 26e9e321f..7ceafa200 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3937,6 +3937,10 @@
                     "name": "Golf Course",
                     "terms": "links"
                 },
+                "leisure/hackerspace": {
+                    "name": "Hackerspace",
+                    "terms": "makerspace,hackspace,hacklab"
+                },
                 "leisure/horse_riding": {
                     "name": "Horseback Riding Facility",
                     "terms": "equestrian,stable"