diff --git a/data/presets.yaml b/data/presets.yaml
index dff3ee3ae..13a909446 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -547,6 +547,9 @@ en:
       amenity/parking: 
         name: Car Parking
         terms: "<translate with synonyms or related terms for 'Car Parking', separated by commas>"
+      amenity/parking_entrance: 
+        name: Parking Garage Entrance/Exit
+        terms: "<translate with synonyms or related terms for 'Parking Garage Entrance/Exit', separated by commas>"
       amenity/pharmacy: 
         name: Pharmacy
         terms: "<translate with synonyms or related terms for 'Pharmacy', separated by commas>"
@@ -731,8 +734,8 @@ en:
         name: Dormitory
         terms: "<translate with synonyms or related terms for 'Dormitory', separated by commas>"
       building/entrance: 
-        name: Entrance
-        terms: "<translate with synonyms or related terms for 'Entrance', separated by commas>"
+        name: Entrance/Exit
+        terms: "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
       building/garage: 
         name: Garage
         terms: "<translate with synonyms or related terms for 'Garage', separated by commas>"
@@ -941,8 +944,8 @@ en:
         name: Emergency Phone
         terms: "<translate with synonyms or related terms for 'Emergency Phone', separated by commas>"
       entrance: 
-        name: Entrance
-        terms: "<translate with synonyms or related terms for 'Entrance', separated by commas>"
+        name: Entrance/Exit
+        terms: "<translate with synonyms or related terms for 'Entrance/Exit', separated by commas>"
       footway/crossing: 
         name: Crossing
         terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f21bed186..2eaf2a290 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1010,6 +1010,20 @@
         "terms": [],
         "name": "Car Parking"
     },
+    "amenity/parking_entrance": {
+        "icon": "entrance",
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "amenity": "parking_entrance"
+        },
+        "fields": [
+            "access_simple",
+            "ref"
+        ],
+        "name": "Parking Garage Entrance/Exit"
+    },
     "amenity/pharmacy": {
         "icon": "pharmacy",
         "fields": [
@@ -2162,7 +2176,7 @@
         "tags": {
             "building": "entrance"
         },
-        "name": "Entrance",
+        "name": "Entrance/Exit",
         "searchable": false
     },
     "building/garage": {
@@ -3487,7 +3501,7 @@
             "access_simple",
             "address"
         ],
-        "name": "Entrance"
+        "name": "Entrance/Exit"
     },
     "footway/crossing": {
         "fields": [
diff --git a/data/presets/presets/amenity/parking_entrance.json b/data/presets/presets/amenity/parking_entrance.json
new file mode 100644
index 000000000..1ed038918
--- /dev/null
+++ b/data/presets/presets/amenity/parking_entrance.json
@@ -0,0 +1,14 @@
+{
+    "icon": "entrance",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "amenity": "parking_entrance"
+    },
+    "fields": [
+        "access_simple",
+        "ref"
+    ],
+    "name": "Parking Garage Entrance/Exit"
+}
diff --git a/data/presets/presets/building/entrance.json b/data/presets/presets/building/entrance.json
index b05d0ec71..9c66caa2c 100644
--- a/data/presets/presets/building/entrance.json
+++ b/data/presets/presets/building/entrance.json
@@ -6,6 +6,6 @@
     "tags": {
         "building": "entrance"
     },
-    "name": "Entrance",
+    "name": "Entrance/Exit",
     "searchable": false
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index f4ae9007c..a61e8268b 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -11,5 +11,5 @@
         "access_simple",
         "address"
     ],
-    "name": "Entrance"
+    "name": "Entrance/Exit"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9b9708439..9f0e0b2d2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1170,6 +1170,10 @@
                 "name": "Car Parking",
                 "terms": ""
             },
+            "amenity/parking_entrance": {
+                "name": "Parking Garage Entrance/Exit",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
                 "terms": ""
@@ -1415,7 +1419,7 @@
                 "terms": ""
             },
             "building/entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "building/garage": {
@@ -1695,7 +1699,7 @@
                 "terms": ""
             },
             "entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "footway/crossing": {
diff --git a/js/id/core/area_keys.js b/js/id/core/area_keys.js
index 1e3ab58cd..c4fc1aa17 100644
--- a/js/id/core/area_keys.js
+++ b/js/id/core/area_keys.js
@@ -10,6 +10,7 @@ iD.areaKeys = {
         "bench": true,
         "clock": true,
         "drinking_water": true,
+        "parking_entrance": true,
         "post_box": true,
         "telephone": true,
         "vending_machine": true,