diff --git a/src/Makefile.am b/src/Makefile.am
index 5bbcb8630..48434e4f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,14 @@ supertuxkart_SOURCES = \
  main.cpp \
  main_loop.cpp \
  main_loop.hpp \
+ animations/animation_base.hpp \
+ animations/animation_base.cpp \
+ animations/animation_manager.cpp \
+ animations/animation_manager.hpp \
+ animations/billboard_animation.cpp \
+ animations/billboard_animation.hpp \
+ animations/three_d_animation.cpp \
+ animations/three_d_animation.hpp \
  audio/music.hpp \
  audio/music_information.cpp \
  audio/music_information.hpp \
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index c752a6b90..f43b51af8 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -701,6 +701,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="animations"
+				>
+				<File
+					RelativePath="..\..\animations\animation_base.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\animation_manager.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\billboard_animation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\three_d_animation.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Headerdateien"
@@ -1295,6 +1315,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="animations"
+				>
+				<File
+					RelativePath="..\..\animations\animation_base.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\animation_manager.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\billboard_animation.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\animations\three_d_animation.hpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Ressourcendateien"
diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp
index b9fc243a2..e5fafe268 100644
--- a/src/tracks/track.cpp
+++ b/src/tracks/track.cpp
@@ -26,6 +26,7 @@
 #include "irrlicht.h"
 using namespace irr;
 
+#include "animations/animation_manager.hpp"
 #include "audio/sound_manager.hpp"
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
@@ -70,6 +71,7 @@ Track::Track( std::string filename_, float w, float h, bool stretch )
     m_has_final_camera   = false;
     m_is_arena           = false;
     m_quad_graph         = NULL;
+	m_animation_manager  = NULL;
     loadTrack(m_filename);
     loadDriveline();
 
@@ -79,7 +81,8 @@ Track::Track( std::string filename_, float w, float h, bool stretch )
 /** Destructor, removes quad data structures etc. */
 Track::~Track()
 {
-    if(m_quad_graph) delete m_quad_graph;
+    if(m_quad_graph)        delete m_quad_graph;
+	if(m_animation_manager) delete m_animation_manager;
 }   // ~Track
 
 //-----------------------------------------------------------------------------
@@ -520,6 +523,11 @@ void Track::loadTrack(const std::string &filename)
 	if(xml_node)
 		loadCurves(*xml_node);
 
+    xml_node = root->getNode("animations");
+	if(xml_node)
+	{
+		m_animation_manager = new AnimationManager(*xml_node);
+	}
 	// Set the correct paths
     m_screenshot = file_manager->getTrackFile(m_screenshot, getIdent());
     delete root;
diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp
index 0e8f23c90..956427397 100644
--- a/src/tracks/track.hpp
+++ b/src/tracks/track.hpp
@@ -46,6 +46,7 @@ class MovingTexture;
 class XMLNode;
 class PhysicalObject;
 class BezierCurve;
+class AnimationManager;
 
 class Track
 {
@@ -101,6 +102,9 @@ private:
 	/** List of all bezier curves in the track - for e.g. camera, ... */
 	std::vector<BezierCurve*> m_all_curves;
 
+	/** Animation manager. */
+	AnimationManager         *m_animation_manager;
+
 	void loadCurves(const XMLNode &node);
     void handleAnimatedTextures(scene::ISceneNode *node, const XMLNode &xml);