diff --git a/car_amenities.json b/car_amenities.json
index 1c009710..67daf231 100644
--- a/car_amenities.json
+++ b/car_amenities.json
@@ -19,6 +19,8 @@
             "node[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
             "way[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
             "relation[amenity~\"^(car_rental|car_sharing|fuel)$\"];",
+            "node[amenity~\"^(charging_station)$\"][car!=\"no\"];",
+            "node[amenity~\"^(charging_station)$\"][motorcycle!=\"no\"];",
             ")"
         ],
         "16": [
@@ -44,6 +46,7 @@
         "charging_station": "🔌 ",
         "fuel": "⛽",
         "parking": "🅿",
-        "motorcycle_parking": "🅿"
+        "motorcycle_parking": "🅿",
+        "charging_station": "🔌"
     }
 }
diff --git a/cycle_amenities.json b/cycle_amenities.json
index 2c92eb24..12d20a19 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -22,6 +22,7 @@
             "node[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "way[amenity~\"^(bicycle_.*|compressed_air)$\"];",
             "relation[amenity~\"^(bicycle_.*|compressed_air)$\"];",
+            "node[amenity~\"^(charging_station)$\"][bicycle!=\"no\"];",
             "node[shop~\"^(bicycle)$\"];",
             "way[shop~\"^(bicycle)$\"];",
             "relation[shop~\"^(bicycle)$\"];",
@@ -122,6 +123,10 @@
         "amenity=compressed_air": {
             "sign": "A",
             "priority": 2
+        },
+        "amenity=charging_station": {
+            "sign": "🔌",
+            "priority": 2
         }
     }
-}
+}
\ No newline at end of file