diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 9061f84027..a5dc8ec687 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -64,13 +64,16 @@ RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const b
 {
     // select best shader mode
     bool openGL = (Ogre::Root::getSingleton ().getRenderSystem ()->getName().find("OpenGL") != std::string::npos);
+    bool glES = (Ogre::Root::getSingleton ().getRenderSystem ()->getName().find("OpenGL ES") != std::string::npos);
 
     // glsl is only supported in opengl mode and hlsl only in direct3d mode.
-    if (Settings::Manager::getString("shader mode", "General") == ""
-            || (openGL && Settings::Manager::getString("shader mode", "General") == "hlsl")
-            || (!openGL && Settings::Manager::getString("shader mode", "General") == "glsl"))
+    std::string currentMode = Settings::Manager::getString("shader mode", "General");
+    if (currentMode == ""
+            || (openGL && currentMode == "hlsl")
+            || (!openGL && currentMode == "glsl")
+            || (glES && currentMode != "glsles"))
     {
-        Settings::Manager::setString("shader mode", "General", openGL ? "glsl" : "hlsl");
+        Settings::Manager::setString("shader mode", "General", openGL ? (glES ? "glsles" : "glsl") : "hlsl");
     }
 
     mRendering.createScene("PlayerCam", Settings::Manager::getFloat("field of view", "General"), 5);
@@ -93,6 +96,8 @@ RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const b
     std::string l = Settings::Manager::getString("shader mode", "General");
     if (l == "glsl")
         lang = sh::Language_GLSL;
+    else if (l == "glsles")
+        lang = sh::Language_GLSLES;
     else if (l == "hlsl")
         lang = sh::Language_HLSL;
     else
diff --git a/extern/shiny/Docs/Materials.dox b/extern/shiny/Docs/Materials.dox
index 91e9be4b30..d08599a04a 100644
--- a/extern/shiny/Docs/Materials.dox
+++ b/extern/shiny/Docs/Materials.dox
@@ -87,6 +87,8 @@
 	Now, let's get into writing our shader! As you can guess from above, the filename should be 'example.shader'.
 	Make sure to also copy the 'core.h' file to the same location. It is included in shiny's source tree under 'Extra/'.
 
+	Important: a newline at the end of the file is <b>required</b>. Many editors do this automatically or can be configured to do so. If there is no newline at the end of the file, and the last line is '#endif', you will get the rather cryptic error message " ill formed preprocessor directive: #endif" from boost::wave.
+
 	\code
 	#include "core.h"
 
diff --git a/extern/shiny/Editor/Actions.hpp b/extern/shiny/Editor/Actions.hpp
index e5cb6df6a5..1bbdbe5a98 100644
--- a/extern/shiny/Editor/Actions.hpp
+++ b/extern/shiny/Editor/Actions.hpp
@@ -10,7 +10,7 @@ namespace sh
 	{
 	public:
 		virtual void execute() = 0;
-		virtual ~Action();
+		virtual ~Action() {}
 	};
 
 	class ActionDeleteMaterial : public Action
diff --git a/extern/shiny/Editor/Query.hpp b/extern/shiny/Editor/Query.hpp
index 7aec684880..d98c8c9b27 100644
--- a/extern/shiny/Editor/Query.hpp
+++ b/extern/shiny/Editor/Query.hpp
@@ -15,7 +15,7 @@ class Query
 public:
 	Query()
 		: mDone(false) {}
-	virtual ~Query();
+	virtual ~Query()  {}
 
 	void execute();
 
diff --git a/files/materials/core.h b/files/materials/core.h
index 3385e5face..c15ec6badc 100644
--- a/files/materials/core.h
+++ b/files/materials/core.h
@@ -58,7 +58,7 @@
 
 #endif
 
-#if SH_GLSL == 1
+#if SH_GLSL == 1 || SH_GLSLES == 1
 
 	#define shFract(val) fract(val)
 
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index 7be7137969..e699fbbcc6 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -206,6 +206,7 @@ void OgreRenderer::configure(const std::string &logPath,
     pluginDir = absPluginPath.string();
 
     Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mRoot);
+    Files::loadOgrePlugin(pluginDir, "RenderSystem_GLES2", *mRoot);
     Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mRoot);
     Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mRoot);
     Files::loadOgrePlugin(pluginDir, "Plugin_CgProgramManager", *mRoot);