diff --git a/data/classificator.txt b/data/classificator.txt
index 6764db9a31..c077aa5792 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -117,6 +117,7 @@ world  +
         place_of_worship  +
             buddhist  -
             christian  +
+                jehovahs_witness  -
                 mormon  -
                 {}
             hindu  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0f0fda0303..865772504f 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 9ff63e41b9..905f5b38e7 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7794,6 +7794,127 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-s"
+      priority: 4900
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship-christian-mormon"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f7d0b9f454..be4098f84c 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 3dfec91b63..f9887df425 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -7668,6 +7668,127 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-s"
+      priority: 4900
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15591638
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship-christian-mormon"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index ce209a189b..3f1b7fb84d 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index d07289d356..8787b3ea82 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -7668,6 +7668,127 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-s"
+      priority: 4900
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2499106
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2499106
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2499106
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2499106
+      priority: -1760
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 4900
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5100
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship-christian-mormon"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index f8845ef84f..21b1b5fba1 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 261ec24672..1bb9de6fb9 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -3016,6 +3016,68 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 16
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship-christian-mormon"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 3faa845d36..73726aab17 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index a5140eba40..e4aaaeefe2 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -3016,6 +3016,68 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 16
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "place-of-worship-m"
+      priority: 650
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9350
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship-christian-mormon"
   element {
diff --git a/data/types.txt b/data/types.txt
index 410f7f0265..bde533d14f 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1585,3 +1585,4 @@ amenity|recycling|container
 *leisure|outdoor_seating
 *railway|station|light_rail|london
 *railway|station|light_rail|porto
+*amenity|place_of_worship|christian|jehovahs_witness
diff --git a/data/visibility.txt b/data/visibility.txt
index 1971036d9f..ddfc18df7c 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -117,6 +117,7 @@ world  00000000000000000000  +
         place_of_worship  00000000000000001111  +
             buddhist  00000000000000001111  -
             christian  00000000000000001111  +
+                jehovahs_witness  00000000000000001111  -
                 mormon  00000000000000001111  -
                 {}
             hindu  00000000000000001111  -