diff --git a/CMakeLists.txt b/CMakeLists.txt
index 569e28675..e56550430 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ endif()
 
 find_package(OGRE REQUIRED)
 find_package(MyGUI REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
+find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread wave)
 find_package(OIS REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(Bullet REQUIRED)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 9534ecc90..911bd70d5 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -101,7 +101,8 @@ target_link_libraries(openmw
     ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${MYGUI_PLATFORM_LIBRARIES}
-    components
+    "shiny"
+    "shiny.OgrePlatform"
 )
 
 # Fix for not visible pthreads functions for linker with glibc 2.15
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5b76f5ae2..8672946fc 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -14,6 +14,9 @@
 #include <OgreCompositionPass.h>
 #include <OgreHardwarePixelBuffer.h>
 
+#include <extern/shiny/Main/Factory.hpp>
+#include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp>
+
 #include <components/esm/loadstat.hpp>
 #include <components/settings/settings.hpp>
 
@@ -47,6 +50,11 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
 
     mWater = 0;
 
+    // material system
+    sh::OgrePlatform* platform = new sh::OgrePlatform("General", "./");
+    platform->setCacheFolder ("./");
+    mFactory = new sh::Factory(platform);
+
     //The fog type must be set before any terrain objects are created as if the
     //fog type is set to FOG_NONE then the initially created terrain won't have any fog
     configureFog(1, ColourValue(1,1,1));
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 9aaba3803..db5a731b4 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -43,6 +43,11 @@ namespace MWWorld
     class CellStore;
 }
 
+namespace sh
+{
+    class Factory;
+}
+
 namespace MWRender
 {
 
@@ -174,6 +179,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
 
   private:
 
+    sh::Factory* mFactory;
+
     void setAmbientMode();
 
     void setMenuTransparency(float val);
diff --git a/extern/shiny b/extern/shiny
index 51b573fc6..392894931 160000
--- a/extern/shiny
+++ b/extern/shiny
@@ -1 +1 @@
-Subproject commit 51b573fc66ac9a61fe780070692cc600a89f51dd
+Subproject commit 3928949316713d0c8aaf1ad564734d24ad773be9