diff --git a/data/stk_config.xml b/data/stk_config.xml
index ae81fe090..c3f9f432a 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -109,9 +109,13 @@
       work anymore - so for now don't enable this. -->
   <networking enable="false"/>
 
-  <!-- Disable steering when stop skidding during the time it takes to
-       adjust the physical body with the graphics. -->
-  <steer disable-while-unskid="true"/>
+  <!-- disable-while-unskid: Disable steering when stop skidding during 
+           the time it takes to adjust the physical body with the graphics.
+       camera-follow-skid: If true the camera will stay behind the kart,
+           potentially making it easier to see where the kart is going to 
+           after a skid. -->
+  <steer disable-while-unskid="false"
+         camera-follow-skid="true"     />
 
   <!-- Default values for all karts
        ============================ -->
diff --git a/src/config/stk_config.cpp b/src/config/stk_config.cpp
index 9dc111f4b..28b926cf3 100644
--- a/src/config/stk_config.cpp
+++ b/src/config/stk_config.cpp
@@ -152,32 +152,33 @@ void STKConfig::load(const std::string &filename)
  */
 void STKConfig::init_defaults()
 {
-    m_anvil_weight             = m_parachute_friction        =
-        m_parachute_time       = m_parachute_done_fraction   =
-        m_parachute_time_other = m_anvil_speed_factor        =
-        m_bomb_time            = m_bomb_time_increase        =
-        m_anvil_time           = m_music_credit_time         =
-        m_delay_finish_time    = m_skid_fadeout_time         =
-        m_near_ground          = m_item_switch_time          = 
-        m_penalty_time         = m_explosion_impulse_objects = UNDEFINED;
-    m_bubble_gum_counter       = -100;
-    m_max_karts                = -100;
-    m_max_history              = -100;
-    m_max_skidmarks            = -100;
-    m_min_kart_version         = -100;
-    m_max_kart_version         = -100;
-    m_min_track_version        = -100;
-    m_max_track_version        = -100;
-    m_max_display_news         = -100;
-    m_replay_delta_angle       = -100;
-    m_replay_delta_pos2        = -100;
-    m_replay_dt                = -100;
-    m_title_music              = NULL;
-    m_enable_networking        = true;
-    m_smooth_normals           = false;
-    m_same_powerup_mode        = POWERUP_MODE_ONLY_IF_SAME;
-    m_ai_acceleration          = 1.0f;
+    m_anvil_weight               = m_parachute_friction        =
+        m_parachute_time         = m_parachute_done_fraction   =
+        m_parachute_time_other   = m_anvil_speed_factor        =
+        m_bomb_time              = m_bomb_time_increase        =
+        m_anvil_time             = m_music_credit_time         =
+        m_delay_finish_time      = m_skid_fadeout_time         =
+        m_near_ground            = m_item_switch_time          = 
+        m_penalty_time           = m_explosion_impulse_objects = UNDEFINED;
+    m_bubble_gum_counter         = -100;
+    m_max_karts                  = -100;
+    m_max_history                = -100;
+    m_max_skidmarks              = -100;
+    m_min_kart_version           = -100;
+    m_max_kart_version           = -100;
+    m_min_track_version          = -100;
+    m_max_track_version          = -100;
+    m_max_display_news           = -100;
+    m_replay_delta_angle         = -100;
+    m_replay_delta_pos2          = -100;
+    m_replay_dt                  = -100;
+    m_title_music                = NULL;
+    m_enable_networking          = true;
+    m_smooth_normals             = false;
+    m_same_powerup_mode          = POWERUP_MODE_ONLY_IF_SAME;
+    m_ai_acceleration            = 1.0f;
     m_disable_steer_while_unskid = false;
+    m_camera_follow_skid         = false;
     
     m_score_increase.clear();
     m_leader_intervals.clear();
@@ -256,6 +257,7 @@ void STKConfig::getAllData(const XMLNode * root)
     if (const XMLNode *steer_node= root->getNode("steer"))
     {
         steer_node->get("disable-while-unskid", &m_disable_steer_while_unskid);
+        steer_node->get("camera-follow-skid",   &m_camera_follow_skid        );
     }
 
     if (const XMLNode *music_node = root->getNode("music"))
diff --git a/src/config/stk_config.hpp b/src/config/stk_config.hpp
index b9cf4542a..fcbd14343 100644
--- a/src/config/stk_config.hpp
+++ b/src/config/stk_config.hpp
@@ -109,6 +109,10 @@ public:
      *  crashing). */
     bool m_disable_steer_while_unskid;
 
+    /** If true the camera will stay behind the kart, potentially making it
+     *  easier to see where the kart is going to after the skid. */
+    bool m_camera_follow_skid;
+
     float m_ai_acceleration;         /**<Between 0 and 1, default being 1, can be
                                          used to give a handicap to AIs */
     
diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp
index 7c5c8ddf2..8f8f18ef9 100644
--- a/src/graphics/skid_marks.cpp
+++ b/src/graphics/skid_marks.cpp
@@ -79,7 +79,7 @@ void SkidMarks::reset()
 void SkidMarks::update(float dt, bool force_skid_marks, 
                        video::SColor* custom_color)
 {
-    //if the kart is gnu, then dont skid because he floats!
+    //if the kart is gnu, then don't skid because he floats!
     if(m_kart.isWheeless())
         return;