diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e23a98dc..c0b5bf4511 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,9 +186,20 @@ if (UNIX AND NOT APPLE)
 find_package (Threads)
 endif()
 
+set(BOOST_COMPONENTS system filesystem program_options thread)
+
+if (Boost_VERSION LESS 104900)
+    set(SHINY_USE_WAVE_SYSTEM_INSTALL TRUE)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} wave)
+else()
+    set(SHINY_USE_WAVE_SYSTEM_INSTALL FALSE)
+endif()
+
+MESSAGE(STATUS ${BOOST_COMPONENTS})
+
 find_package(OGRE REQUIRED)
 find_package(MyGUI REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
+find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(OIS REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(Bullet REQUIRED)
diff --git a/extern/shiny b/extern/shiny
index 34c098c636..fdc92a4243 160000
--- a/extern/shiny
+++ b/extern/shiny
@@ -1 +1 @@
-Subproject commit 34c098c636659b63e0ce85d371f4933c27191753
+Subproject commit fdc92a4243c98f5d86a33cbdf2ed0fbb94dad3f6