diff --git a/data/editor.config b/data/editor.config
index 77633aed06..f45ad351f9 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -81,6 +81,12 @@
       <field name="contact_instagram">
         <tag k="contact:instagram" />
       </field>
+      <field name="contact_fediverse">
+        <tag k="contact:mastodon" />
+      </field>
+      <field name="contact_bluesky">
+        <tag k="contact:bluesky" />
+      </field>
       <field name="contact_twitter">
         <tag k="contact:twitter" />
       </field>
@@ -181,6 +187,8 @@
         <field_ref name="website" />
         <field_ref name="contact_facebook" />
         <field_ref name="contact_instagram" />
+        <field_ref name="contact_fediverse" />
+        <field_ref name="contact_bluesky" />
         <field_ref name="contact_twitter" />
         <field_ref name="contact_vk" />
         <field_ref name="contact_line" />
@@ -197,6 +205,8 @@
         <field_ref name="website" />
         <field_ref name="contact_facebook" />
         <field_ref name="contact_instagram" />
+        <field_ref name="contact_fediverse" />
+        <field_ref name="contact_bluesky" />
         <field_ref name="contact_twitter" />
         <field_ref name="contact_vk" />
         <field_ref name="contact_line" />
diff --git a/editor/editor_config.cpp b/editor/editor_config.cpp
index 476e00ceb0..262af04278 100644
--- a/editor/editor_config.cpp
+++ b/editor/editor_config.cpp
@@ -22,6 +22,8 @@ static std::unordered_map<std::string, EType> const kNamesToFMD = {
     {"website", EType::FMD_WEBSITE},
     {"contact_facebook", EType::FMD_CONTACT_FACEBOOK},
     {"contact_instagram", EType::FMD_CONTACT_INSTAGRAM},
+    {"contact_fediverse", EType::FMD_CONTACT_FEDIVERSE},
+    {"contact_bluesky", EType::FMD_CONTACT_BLUESKY},
     {"contact_twitter", EType::FMD_CONTACT_TWITTER},
     {"contact_vk", EType::FMD_CONTACT_VK},
     {"contact_line", EType::FMD_CONTACT_LINE},
diff --git a/editor/editor_tests/editor_config_test.cpp b/editor/editor_tests/editor_config_test.cpp
index d01c1c1b5c..15e041369a 100644
--- a/editor/editor_tests/editor_config_test.cpp
+++ b/editor/editor_tests/editor_config_test.cpp
@@ -22,6 +22,8 @@ UNIT_TEST(EditorConfig_TypeDescription)
     EType::FMD_CONTACT_TWITTER,
     EType::FMD_CONTACT_VK,
     EType::FMD_CONTACT_LINE,
+    EType::FMD_CONTACT_FEDIVERSE,
+    EType::FMD_CONTACT_BLUESKY,
   };
 
   pugi::xml_document doc;
diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp
index b41700b24b..85a98f71a1 100644
--- a/feature_list/feature_list.cpp
+++ b/feature_list/feature_list.cpp
@@ -261,6 +261,8 @@ public:
     string const contact_twitter(meta.Get(feature::Metadata::FMD_CONTACT_TWITTER));
     string const contact_vk(meta.Get(feature::Metadata::FMD_CONTACT_VK));
     string const contact_line(meta.Get(feature::Metadata::FMD_CONTACT_LINE));
+    string const contact_fediverse(meta.Get(feature::Metadata::FMD_CONTACT_FEDIVERSE));
+    string const contact_bluesky(meta.Get(feature::Metadata::FMD_CONTACT_BLUESKY));
     string const stars(meta.Get(feature::Metadata::FMD_STARS));
     string const internet(meta.Get(feature::Metadata::FMD_INTERNET));
     string const denomination(meta.Get(feature::Metadata::FMD_DENOMINATION));
@@ -276,7 +278,7 @@ public:
         osmId,             uid,             lat,           lon,       mwmName, category,     name,    std::string(city),
         addrStreet,        addrHouse,       phone,         website,   stars,   std::string(metaOperator), internet,
         denomination,      wheelchair,      opening_hours, wikipedia, floor,   fee,          atm,     contact_facebook,
-        contact_instagram, contact_twitter, contact_vk,    contact_line, wikimedia_commons};
+        contact_instagram, contact_twitter, contact_vk,    contact_line, contact_fediverse, contact_bluesky, wikimedia_commons};
 
     AppendNames(f, columns);
     PrintAsCSV(columns, ';', cout);
@@ -290,7 +292,7 @@ void PrintHeader()
                             "phone",           "website",      "cuisines",   "stars",            "operator",
                             "internet",        "denomination", "wheelchair", "opening_hours",    "wikipedia",
                             "floor",           "fee",          "atm",        "contact_facebook", "contact_instagram",
-                            "contact_twitter", "contact_vk",   "contact_line", "wikimedia_commons"};
+                            "contact_twitter", "contact_vk",   "contact_line", "contact_fediverse", "contact_bluesky", "wikimedia_commons"};
   // Append all supported name languages in order.
   for (uint8_t idx = 1; idx < kLangCount; idx++)
     columns.push_back("name_" + string(StringUtf8Multilang::GetLangByCode(idx)));
diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index 6310d397d7..aca8149139 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -249,6 +249,8 @@ bool EditableMapObject::IsValidMetadata(MetadataID type, std::string const & val
   case MetadataID::FMD_CONTACT_TWITTER: return ValidateTwitterPage(value);
   case MetadataID::FMD_CONTACT_VK: return ValidateVkPage(value);
   case MetadataID::FMD_CONTACT_LINE: return ValidateLinePage(value);
+  case MetadataID::FMD_CONTACT_FEDIVERSE: return ValidateFediversePage(value);
+  case MetadataID::FMD_CONTACT_BLUESKY: return ValidateBlueskyPage(value);
 
   case MetadataID::FMD_STARS:
   {
@@ -284,6 +286,8 @@ void EditableMapObject::SetMetadata(MetadataID type, std::string value)
   case MetadataID::FMD_CONTACT_TWITTER: value = ValidateAndFormat_twitter(value); break;
   case MetadataID::FMD_CONTACT_VK: value = ValidateAndFormat_vk(value); break;
   case MetadataID::FMD_CONTACT_LINE: value = ValidateAndFormat_contactLine(value); break;
+  case MetadataID::FMD_CONTACT_FEDIVERSE: value = ValidateAndFormat_fediverse(value); break;
+  case MetadataID::FMD_CONTACT_BLUESKY: value = ValidateAndFormat_bluesky(value); break;
   default: break;
   }
 
diff --git a/qt/place_page_dialog_developer.cpp b/qt/place_page_dialog_developer.cpp
index bf19b93531..4038024ea1 100644
--- a/qt/place_page_dialog_developer.cpp
+++ b/qt/place_page_dialog_developer.cpp
@@ -113,6 +113,8 @@ PlacePageDialogDeveloper::PlacePageDialogDeveloper(QWidget * parent, place_page:
     case PropID::FMD_CONTACT_TWITTER:
     case PropID::FMD_CONTACT_VK:
     case PropID::FMD_CONTACT_LINE:
+    case PropID::FMD_CONTACT_FEDIVERSE:
+    case PropID::FMD_CONTACT_BLUESKY:
     case PropID::FMD_WIKIPEDIA:
     case PropID::FMD_WIKIMEDIA_COMMONS:
       isLink = true;
diff --git a/qt/place_page_dialog_user.cpp b/qt/place_page_dialog_user.cpp
index b792cf305b..37a72a2efb 100644
--- a/qt/place_page_dialog_user.cpp
+++ b/qt/place_page_dialog_user.cpp
@@ -218,6 +218,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
       addSocialNetworkWidget("Twitter", feature::Metadata::EType::FMD_CONTACT_TWITTER);
       addSocialNetworkWidget("VK", feature::Metadata::EType::FMD_CONTACT_VK);
       addSocialNetworkWidget("Line", feature::Metadata::EType::FMD_CONTACT_LINE);
+      addSocialNetworkWidget("Mastodon", feature::Metadata::EType::FMD_CONTACT_FEDIVERSE);
+      addSocialNetworkWidget("Bluesky", feature::Metadata::EType::FMD_CONTACT_BLUESKY);
     }
 
     if (auto wikimedia_commons = info.GetMetadata(feature::Metadata::EType::FMD_WIKIMEDIA_COMMONS); !wikimedia_commons.empty())