diff --git a/data/categories.txt b/data/categories.txt
index 9237adf84d..20a174ac45 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -2826,3 +2826,7 @@ ar:شاطئ
 da:strand
 tr:plaj
 sv:stranden
+
+highway-speed_camera
+en:3speed camera
+ru:3камера скорости
diff --git a/data/classificator.txt b/data/classificator.txt
index e741778605..e925816cf5 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -266,6 +266,7 @@ world  +
             parking_aisle  -
             tunnel  -
             {}
+        speed_camera  -
         steps  +
             bridge  -
             tunnel  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 7caa3aa22c..b826d886b2 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index bdc0ef0d8f..fdd277aefb 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -24998,6 +24998,44 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-speed_camera"
+  element {
+    scale: 15
+    symbol {
+      name: "speed_trap"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "speed_trap"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "speed_trap"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "speed_trap"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "speed_trap"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "highway-steps"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 9d0ac2768c..842b5ca4de 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -987,4 +987,5 @@ amenity|waste_disposal;[amenity=waste_disposal];;name;int_name;986;
 amenity|bbq;[amenity=bbq];;name;int_name;987;
 hwtag|private;[hwtag=private];;name;int_name;988;
 route|ferry|motorcar;[route=ferry];;name;int_name;989;
-junction|roundabout;[junction=roundabout];;name;int_name;990;
\ No newline at end of file
+junction|roundabout;[junction=roundabout];;name;int_name;990;
+highway|speed_camera;[highway=speed_camera];;name;int_name;991;
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index b504571cac..16c6defd46 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -2022,10 +2022,21 @@ line|z15[boundary=administrative][border_type=country]
 }
 
 area|z15-[amenity=fuel],
-node|z15-[amenity=fuel]
+node|z15-[amenity=fuel],
 {
   icon-image: petrolstation.svg;
 }
+
+line[highway=speed_camera]
+{
+  casing-width: 0;
+}
+area|z15-[highway=speed_camera],
+node|z15-[highway=speed_camera],
+{
+  icon-image: speed_trap.svg;
+}
+
 area|z15-[leisure=nature_reserve],
 node|z15-[leisure=nature_reserve]
 {
diff --git a/data/types.txt b/data/types.txt
index ce2bf24698..6b955170b4 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -988,3 +988,4 @@ amenity|bbq
 hwtag|private
 route|ferry|motorcar
 junction|roundabout
+highway|speed_camera