diff --git a/data/categories.txt b/data/categories.txt
index 574a53c5de..5d948831ee 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -4185,6 +4185,46 @@ sk:3Kino
sw:4Sinema|burudani
fa:سینما
+leisure-bowling_alley|@entertainment
+en:4Bowling Alley
+ar:ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ
+be:Боўлінг
+bg:Боулинг писта
+ca:Bolera
+cs:Bowlingová dráha
+da:Bowling bane
+de:Bowlingbahn
+el:Αίθουσα σφαιρίσεως
+es:Bolera
+et:Bowlingusaal
+eu:Bolatokia
+fa:ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ
+fi:Keilarata
+fr:Salle de bowling
+he:גנילואב םלוא
+hu:Tekepálya
+id:Arena Bowling
+it:Sala da bowling
+ja:ボーリング場
+ko:볼링장
+mr:गोलंदाजी गल्ली
+nb:Bowlinghall
+nl:Bowlingbaan
+pl:Kręgielnia
+pt:Pista de bowling
+pt-BR:Pista de boliche
+ro:Popicărie
+ru:4Боулинг
+sk:Bowlingová dráha
+sv:Bowlinghall
+sw:Njia ya Bowling
+th:ลานโบว์ลิ่ง
+tr:Bowling pisti
+uk:Боулінг
+vi:Sân chơi bowling
+zh-Hans:保龄球馆
+zh-Hant:保齡球館
+
amenity-theatre|@entertainment
en:4Theatre|U+1F3AD
en-US:4Theater
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index f62124f241..7095aca9fc 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -434,7 +434,7 @@ amenity|waste_transfer_station;433;
historic|battlefield;434;
deprecated|deprecated;435;x
sport|australian_football;436;
-deprecated|deprecated;437;x
+leisure|bowling_alley;437;
deprecated|deprecated;438;x
deprecated|deprecated;439;x
deprecated|deprecated;440;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index c0210bc644..63aabd71b6 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -1121,6 +1121,46 @@
zh-Hans = 电影院
zh-Hant = 電影院
+ [type.leisure.bowling_alley]
+ en = Bowling Alley
+ ar = ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ
+ be = Боўлінг
+ bg = Боулинг писта
+ ca = Bolera
+ cs = Bowlingová dráha
+ da = Bowling bane
+ de = Bowlingbahn
+ el = Αίθουσα σφαιρίσεως
+ es = Bolera
+ et = Bowlingusaal
+ eu = Bolatokia
+ fa = ﮓﻨﯿﻟﻮﺑ ﻦﻟﺎﺳ
+ fi = Keilarata
+ fr = Salle de bowling
+ he = גנילואב םלוא
+ hu = Tekepálya
+ id = Arena Bowling
+ it = Sala da bowling
+ ja = ボーリング場
+ ko = 볼링장
+ mr = गोलंदाजी गल्ली
+ nb = Bowlinghall
+ nl = Bowlingbaan
+ pl = Kręgielnia
+ pt = Pista de bowling
+ pt-BR = Pista de boliche
+ ro = Popicărie
+ ru = Боулинг
+ sk = Bowlingová dráha
+ sv = Bowlinghall
+ sw = Njia ya Bowling
+ th = ลานโบว์ลิ่ง
+ tr = Bowling pisti
+ uk = Боулінг
+ vi = Sân chơi bowling
+ zh-Hans = 保龄球馆
+ zh-Hant = 保齡球館
+
[type.amenity.clinic]
en = Clinic
ar = عيادة
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 222ac551be..8a3c758d82 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -184,6 +184,10 @@ node|z18-[sport=equestrian],
area|z18-[sport=equestrian],
node|z18-[sport=climbing],
area|z18-[sport=climbing],
+node|z18-[sport=9pin],
+area|z18-[sport=9pin],
+node|z18-[sport=10pin],
+area|z18-[sport=10pin],
node|z18-[sport=chess],
area|z18-[sport=chess],
{z-index: 2440;}
@@ -323,6 +327,8 @@ node[amenity=courthouse],
area[amenity=courthouse],
node[amenity=cinema],
area[amenity=cinema],
+node[leisure=bowling_alley],
+area[leisure=bowling_alley],
node[amenity=nightclub],
area[amenity=nightclub],
node[amenity=police],
@@ -1478,6 +1484,8 @@ node|z17-[amenity=school],
area|z17-[amenity=school],
node|z17-[amenity=cinema],
area|z17-[amenity=cinema],
+node|z17-[leisure=bowling_alley],
+area|z17-[leisure=bowling_alley],
node|z17-[amenity=police],
area|z17-[amenity=police],
node|z17-[amenity=prison],
@@ -2030,6 +2038,13 @@ node|z18-[amenity=cinema],
area|z18-[amenity=cinema]
{font-size: 11;text-optional: true;}
+node|z17-[leisure=bowling_alley],
+area|z17-[leisure=bowling_alley],
+{icon-image: bowling_alley-m.svg;text-optional: true;}
+node|z18-[leisure=bowling_alley],
+area|z18-[leisure=bowling_alley],
+{font-size: 11;text-optional: true;}
+
node|z17-[amenity=police],
area|z17-[amenity=police]
{icon-image: police-m.svg;text-optional: true;}
diff --git a/data/styles/clear/style-clear/symbols/bowling_alley-m.svg b/data/styles/clear/style-clear/symbols/bowling_alley-m.svg
new file mode 100644
index 0000000000..d2ef4eb530
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bowling_alley-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/bowling_alley-m.svg b/data/styles/clear/style-night/symbols/bowling_alley-m.svg
new file mode 100644
index 0000000000..bb99e3110f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bowling_alley-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index ae874b6f9e..c76dad7c50 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -151,6 +151,8 @@ private:
{"amenity", "drinking_water"},
{"shop", "copyshop"}, // often used as secondary tag for amenity=post_office
{"leisure", "pitch"}, // Give priority to tag "sport"=*.
+ {"sport", "9pin"},
+ {"sport", "10pin"},
{"public_transport", "platform"},
};