diff --git a/src/modes/soccer_world.hpp b/src/modes/soccer_world.hpp
index 9108cf755..5ef697f29 100644
--- a/src/modes/soccer_world.hpp
+++ b/src/modes/soccer_world.hpp
@@ -16,8 +16,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef THREE_STRIKES_HPP
-#define THREE_STRIKES_HPP
+#ifndef SOCCER_WORLD_HPP
+#define SOCCER_WORLD_HPP
 
 #include "modes/world_with_rank.hpp"
 #include "states_screens/race_gui_base.hpp"
@@ -80,7 +80,7 @@ public:
 
     
     void updateKartRanks();
-};   // SoccerWorlds
+};   // SoccerWorld
 
 
 #endif
diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
index ff2292a73..6cd06e59e 100644
--- a/src/race/race_manager.cpp
+++ b/src/race/race_manager.cpp
@@ -38,6 +38,7 @@
 #include "modes/standard_race.hpp"
 #include "modes/world.hpp"
 #include "modes/three_strikes_battle.hpp"
+#include "modes/soccer_world.hpp"
 #include "network/network_manager.hpp"
 #include "states_screens/grand_prix_lose.hpp"
 #include "states_screens/grand_prix_win.hpp"
@@ -390,6 +391,8 @@ void RaceManager::startNextRace()
         World::setWorld(new StandardRace());
     else if(m_minor_mode==MINOR_MODE_3_STRIKES)     
         World::setWorld(new ThreeStrikesBattle());
+    else if(m_minor_mode==MINOR_MODE_SOCCER)
+        World::setWorld(new SoccerWorld());
     else if(m_minor_mode==MINOR_MODE_OVERWORLD)     
         World::setWorld(new OverWorld());
     else if(m_minor_mode==MINOR_MODE_CUTSCENE)
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index bc9040b95..e364e1b6d 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -806,8 +806,10 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
         //x,y is the target position
         int lap = info.lap;
         
-        // In battle mode there is no distance along track etc.
-        if(race_manager->getMinorMode()==RaceManager::MINOR_MODE_3_STRIKES)
+        // In battle mode and soccer mode there is no distance along track etc.
+        const RaceManager::MinorRaceModeType  minor_mode = race_manager->getMinorMode();
+        if( minor_mode==RaceManager::MINOR_MODE_3_STRIKES ||
+            minor_mode==RaceManager::MINOR_MODE_SOCCER)
         {
             x = x_base;
             y = previous_y+ICON_PLAYER_WIDTH+2;