diff --git a/data/classificator.txt b/data/classificator.txt
index 044e46550c..9720875a10 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -504,6 +504,7 @@ world  +
         cemetery  +
             christian  -
             {}
+        churchyard  -
         commercial  -
         construction  -
         farm  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 81f93421fe..3d2a7b74f8 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 e626d3a655..563a4f8fdb 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -31730,6 +31730,44 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-churchyard"
+  element {
+    scale: 15
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+}
 cont {
   name: "landuse-commercial"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 9942c5399a..a274ec8055 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 390e5b301e..2c4e6af2ae 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -31394,6 +31394,44 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-churchyard"
+  element {
+    scale: 15
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14934482
+      priority: -15978
+    }
+  }
+}
 cont {
   name: "landuse-commercial"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 02f6fcb159..7f05796832 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 75b07d54c2..7d0ede9933 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -31550,6 +31550,39 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-churchyard"
+  element {
+    scale: 15
+    area {
+      priority: -15978
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -15978
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -15978
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -15978
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -15978
+    }
+  }
+}
 cont {
   name: "landuse-commercial"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index df09c2a969..0fd1dc44bd 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 b706d86141..56d6a67f11 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -19302,6 +19302,44 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-churchyard"
+  element {
+    scale: 15
+    area {
+      color: 14934482
+      priority: -15966
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14934482
+      priority: -15966
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14934482
+      priority: -15966
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14934482
+      priority: -15966
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14934482
+      priority: -15966
+    }
+  }
+}
 cont {
   name: "landuse-construction"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 7410cc01d6..1b2820eb89 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 21374f4218..0f0fb278a8 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -19692,6 +19692,44 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-churchyard"
+  element {
+    scale: 15
+    area {
+      color: 328965
+      priority: -15966
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 328965
+      priority: -15966
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 328965
+      priority: -15966
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 328965
+      priority: -15966
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 328965
+      priority: -15966
+    }
+  }
+}
 cont {
   name: "landuse-construction"
   element {
diff --git a/data/types.txt b/data/types.txt
index 067d6ad164..d913905297 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1327,3 +1327,4 @@ amenity|parking_space
 amenity|parking_space|underground
 amenity|parking_space|private
 amenity|parking_space|permissive
+landuse|churchyard
diff --git a/data/visibility.txt b/data/visibility.txt
index b4dcc969cb..1cb846efd5 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -504,6 +504,7 @@ world  00000000000000000000  +
         cemetery  00000000000000111111  +
             christian  00000000000000111111  -
             {}
+        churchyard  00000000000000011111  -
         commercial  00000000000000000000  -
         construction  00000000000000011111  -
         farm  00000000000000000000  -