diff --git a/indra/newview/fsparticipantlist.cpp b/indra/newview/fsparticipantlist.cpp
index d72ffb42b5..4600f228da 100644
--- a/indra/newview/fsparticipantlist.cpp
+++ b/indra/newview/fsparticipantlist.cpp
@@ -1033,7 +1033,7 @@ bool LLParticipantList::LLParticipantListMenu::checkContextMenuItem(const LLSD&
 
 void LLParticipantList::LLParticipantListMenu::handleAddToContactSet()
 {
-	LLAvatarActions::addToContactSet(mUUIDs.front());
+	LLAvatarActions::addToContactSet(mUUIDs);
 }
 
 bool LLParticipantList::LLAvatarItemRecentSpeakerComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const
diff --git a/indra/newview/fsradarmenu.cpp b/indra/newview/fsradarmenu.cpp
index 6179a39595..452076d5b6 100644
--- a/indra/newview/fsradarmenu.cpp
+++ b/indra/newview/fsradarmenu.cpp
@@ -118,6 +118,7 @@ LLContextMenu* FSRadarMenu::createMenu()
 		registrar.add("Avatar.EstateBan",						boost::bind(&LLAvatarActions::estateBanMultiple,					mUUIDs));
 		registrar.add("Avatar.Derender",						boost::bind(&LLAvatarActions::derenderMultiple,						mUUIDs, false));
 		registrar.add("Avatar.DerenderPermanent",				boost::bind(&LLAvatarActions::derenderMultiple,						mUUIDs, true));
+		registrar.add("Avatar.AddToContactSet",					boost::bind(&FSRadarMenu::addToContactSet,							this));
 
 		enable_registrar.add("Avatar.EnableItem",				boost::bind(&FSRadarMenu::enableContextMenuItem,					this, _2));
 		enable_registrar.add("Avatar.VisibleFreezeEject",		boost::bind(&LLAvatarActions::canLandFreezeOrEjectMultiple,			mUUIDs, false));
@@ -257,6 +258,6 @@ void FSRadarMenu::onTrackAvatarMenuItemClick()
 
 void FSRadarMenu::addToContactSet()
 {
-	LLAvatarActions::addToContactSet(mUUIDs.front());
+	LLAvatarActions::addToContactSet(mUUIDs);
 }
 } // namespace FSFloaterRadarMenu
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index 2390749c28..2087f3c2b7 100755
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -105,7 +105,8 @@ LLContextMenu* PeopleContextMenu::createMenu()
 		registrar.add("Avatar.RemoveFriend",	boost::bind(&LLAvatarActions::removeFriendsDialog,		mUUIDs));
 		// registrar.add("Avatar.Share",		boost::bind(&LLAvatarActions::startIM,					mUUIDs)); // *TODO: unimplemented
 		// registrar.add("Avatar.Pay",			boost::bind(&LLAvatarActions::pay,						mUUIDs)); // *TODO: unimplemented
-		
+		registrar.add("Avatar.AddToContactSet",	boost::bind(&PeopleContextMenu::addToContactSet,		this));   // <FS:Ansariel>
+
 		enable_registrar.add("Avatar.EnableItem",	boost::bind(&PeopleContextMenu::enableContextMenuItem, this, _2));
 
 		// create the context menu from the XUI
@@ -130,6 +131,8 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
 		items.push_back(std::string("share"));
 		items.push_back(std::string("pay"));
 		items.push_back(std::string("offer_teleport"));
+
+		items.push_back(std::string("Add to Set")); // <FS:Ansariel> Contact sets
 	}
 	else 
 	{
@@ -292,7 +295,7 @@ void PeopleContextMenu::offerTeleport()
 // <FS:Ansariel> Add to contact set
 void PeopleContextMenu::addToContactSet()
 {
-	LLAvatarActions::addToContactSet(mUUIDs.front());
+	LLAvatarActions::addToContactSet(mUUIDs);
 }
 // </FS:Ansariel>
 
diff --git a/indra/newview/skins/default/xui/de/menu_fs_radar_multiselect.xml b/indra/newview/skins/default/xui/de/menu_fs_radar_multiselect.xml
index 4611bc2245..b1cfbb8674 100644
--- a/indra/newview/skins/default/xui/de/menu_fs_radar_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_fs_radar_multiselect.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
 	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
+	<menu_item_call label="Zu Kontakt-Set hinzufügen..." name="Add to Set"/>
 	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="Anrufen" name="Call"/>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index ba6578e2d1..219f42909f 100755
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
 	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
+	<menu_item_call label="Zu Kontakt-Set hinzufügen..." name="Add to Set"/>
 	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="Anrufen" name="call"/>
diff --git a/indra/newview/skins/default/xui/en/menu_fs_radar_multiselect.xml b/indra/newview/skins/default/xui/en/menu_fs_radar_multiselect.xml
index 871377808d..5060703098 100644
--- a/indra/newview/skins/default/xui/en/menu_fs_radar_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_fs_radar_multiselect.xml
@@ -13,6 +13,13 @@
          function="Avatar.EnableItem"
          parameter="can_add" />
     </menu_item_call>
+    <menu_item_call
+     label="Add to Set"
+     layout="topleft"
+     name="Add to Set">
+        <menu_item_call.on_click
+         function="Avatar.AddToContactSet" />
+    </menu_item_call>
     <menu_item_call
      label="Remove Friends"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 5f973088fd..6c9a585a98 100755
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -13,6 +13,13 @@
          function="Avatar.EnableItem"
          parameter="can_add" />
     </menu_item_call>
+	<menu_item_call
+	 label="Add to Set..."
+	 layout="topleft"
+	 name="Add to Set">
+		<menu_item_call.on_click
+		 function="Avatar.AddToContactSet" />
+	</menu_item_call>
     <menu_item_call
      label="Remove Friends"
      layout="topleft"