diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index 9a898e3b22..f2e1b03dca 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -140,6 +140,23 @@ public:
           md.Set(Metadata::FMD_HEIGHT, value);
       }
     }
+    else if (k == "min_height")
+    {
+      string const & value = ValidateAndFormat_height(v);
+      if (!value.empty())
+        md.Set(Metadata::FMD_MIN_HEIGHT, value);
+    }
+    else if (k == "building:min_level")
+    {
+      // Ignoring if FMD_HEIGHT already set
+      if (md.Get(Metadata::FMD_HEIGHT).empty())
+      {
+        // Converting this attribute into height
+        string const & value = ValidateAndFormat_building_levels(v);
+        if (!value.empty())
+          md.Set(Metadata::FMD_MIN_HEIGHT, value);
+      }
+    }
     else if (k == "denomination")
     {
       string const & value = ValidateAndFormat_denomination(v);
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index 6da5b0ea36..98c8008c06 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -38,7 +38,8 @@ namespace feature
       FMD_MAXSPEED = 17,
       FMD_FLATS = 18,
       FMD_HEIGHT = 19,
-      FMD_DENOMINATION = 20,
+      FMD_MIN_HEIGHT = 20,
+      FMD_DENOMINATION = 21,
       FMD_COUNT
     };