diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 172da1165..c815643f1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9,6 +9,18 @@
 		<string>settings_rlv.xml</string>
 	</array>
 	
+  <key>ClientDefinitionsURL</key>
+  <map>
+    <key>Comment</key>
+	<string>Where to fetch updated client definitions from</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+	<string>http://app.singularityviewer.org/client_definitions.xml</string>
+  </map>
+
   <key>LastSelectedGrid</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 696a225aa..7218b0953 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3333,8 +3333,9 @@ void LLVOAvatar::idleUpdateWindEffect()
 
 bool LLVOAvatar::updateClientTags()
 { 
-	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml");
-	LLSD response = LLHTTPClient::blockingGet("http://46.4.144.79/client_definitions.xml");
+	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_tags_sg1.xml");
+	std::string client_list_url = gSavedSettings.getString("ClientDefinitionsURL");
+	LLSD response = LLHTTPClient::blockingGet(client_list_url);
 	if(response.has("body"))
 	{
 		const LLSD &client_list = response["body"];
@@ -3354,11 +3355,11 @@ bool LLVOAvatar::updateClientTags()
 bool LLVOAvatar::loadClientTags()
 {
 	//Changed the file name to keep Emerald from overwriting it. Hokey stuff in there, and it's missing clients. -HGB
-	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_definitions.xml");
+	std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_tags_sg1.xml");
 
 	if(!LLFile::isfile(client_list_filename))
 	{
-		client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "client_definitions.xml");
+		client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "client_tags_sg1.xml");
 	}
 
 	if(LLFile::isfile(client_list_filename))