diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index b983c79b2..64f61f5e5 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -32,6 +32,7 @@
     <string name="type.amenity.bicycle_repair_station">Bicycle Repair Station</string>
     <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.amenity.brothel">Brothel</string>
+    <string name="type.amenity.love_hotel">Love Hotel</string>
     <string name="type.amenity.bureau_de_change">Currency Exchange</string>
     <string name="type.amenity.bus_station">Bus Station</string>
     <string name="type.amenity.cafe">Cafe</string>
diff --git a/data/categories.txt b/data/categories.txt
index a22673ce8..b5439c37a 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5353,6 +5353,9 @@ sk:Nevestinec|verejný dom
 sw:Danguro
 fa:فاحشه خانه|جنده خانه
 
+amenity-love_hotel|@category_hotel
+en:4Love Hotel|3Sex Hotel|4Adult Hotel
+
 @gambling
 en:Gambling
 ar:القمار
diff --git a/data/editor.config b/data/editor.config
index c13fb13b4..a74041062 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1185,6 +1185,9 @@
       <type id="amenity-brothel" can_add="no">
         <include group="poi_internet" />
       </type>
+      <type id="amenity-love_hotel" can_add="no" group="accomodation">
+        <include group="poi_internet" />
+      </type>
       <type id="amenity-stripclub" can_add="no">
         <include group="poi_internet" />
       </type>
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index c93fc2118..db476617e 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -679,7 +679,7 @@ deprecated|deprecated;559;x
 deprecated|deprecated;560;x
 deprecated|deprecated;561;x
 deprecated|deprecated;562;x
-deprecated|deprecated;563;x
+amenity|love_hotel;563;
 natural|lake;564;natural|water|lake
 power|plant;565;
 power|plant|solar;[power=plant][plant:source=solar];;name;int_name;566;
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index ddac0c397..06c4677bf 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1088,6 +1088,7 @@ node|z18-[amenity=brothel],
 area|z18-[amenity=brothel],
 node|z18-[amenity=stripclub],
 area|z18-[amenity=stripclub],
+node|z18-[amenity=love_hotel],
 node|z18-[amenity=public_bookcase],
 area|z18-[amenity=public_bookcase],
 node|z19-[power=substation],
@@ -1482,6 +1483,7 @@ node|z16-[amenity=nightclub],
 area|z16-[amenity=nightclub]
 {icon-image: nightclub-m.svg;font-size: 11;}
 
+node|z18-[amenity=love_hotel],
 node|z18-[amenity=brothel],
 area|z18-[amenity=brothel],
 node|z18-[amenity=stripclub],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index ba94b140b..d5f8cc5c1 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1107,6 +1107,7 @@ public_transport-platform                           # caption z17- (also has are
 waterway-lock_gate                                  # icon z16-
 === 700
 
+amenity-love_hotel
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
 amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
@@ -2034,6 +2035,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
 # === -9300
 
+# amenity-love_hotel
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
 # amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index d6bc66da6..a4cb96367 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1109,6 +1109,7 @@ public_transport-platform                           # caption z17- (also has are
 waterway-lock_gate                                  # icon z16-
 === 700
 
+amenity-love_hotel
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
 amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
@@ -2039,6 +2040,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
 # === -9300
 
+# amenity-love_hotel
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
 # amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index b992a7890..b4b007615 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2196,6 +2196,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"amenity", "bicycle_rental"},
     {"amenity", "biergarten"},
     {"amenity", "brothel"},
+    {"amenity", "love_hotel"},
     {"amenity", "bureau_de_change"},
     {"amenity", "bus_station"},
     {"amenity", "cafe"},
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index b9cde2710..44fc5c842 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -33,6 +33,7 @@
 "type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
 "type.amenity.biergarten" = "Biergarten";
 "type.amenity.brothel" = "Brothel";
+"type.amenity.love_hotel" = "Love Hotel";
 "type.amenity.bureau_de_change" = "Currency Exchange";
 "type.amenity.bus_station" = "Bus Station";
 "type.amenity.cafe" = "Cafe";