diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b8f60fe24b..8842774d2b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13494,6 +13494,17 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
+		<key>TurnAroundWhenWalkingBackwards</key>
+		<map>
+			<key>Comment</key>
+			<string>Turns your avatar around to face the camera when you are walking backwards.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>1</integer>
+		</map>
   <key>KittyFlickrLastRating</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index e098988757..c82a0a39e4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3548,7 +3548,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 			}
 			LLVector3 velDir = getVelocity();
 			velDir.normalize();
-			if ( mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
+			if (!gSavedSettings.getBOOL("TurnAroundWhenWalkingBackwards") && (mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end()))
 			{
 				F32 vpD = velDir * primDir;
 				if (vpD < -0.5f)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 10074e2558..6c3e394082 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -127,6 +127,19 @@
       width="270"
       control_name="RezUnderLandGroup"
       tool_tip="Attempts to rez objects under the land group if you're in the land group regardless of which current group tag you're wearing."/>
+        <check_box bottom_delta="-30"
+      follows="left|top"
+      font="SansSerifSmall"
+      height="16"
+      initial_value="false"
+      label="Turn avatar around when walking backwards"
+      left="15"
+      mouse_opaque="true"
+      name="backwardsturnavatar"
+      radio_style="false"
+      width="270"
+      control_name="TurnAroundWhenWalkingBackwards"
+      tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
       </panel>