diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ab2f61d99..349a192b2 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -101,6 +101,7 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgscribe)
     ADD_SUBDIRECTORY(osgsequence)
     ADD_SUBDIRECTORY(osgshaders)
+    ADD_SUBDIRECTORY(osgshadermultiviewport)
     ADD_SUBDIRECTORY(osgshadercomposition)
     ADD_SUBDIRECTORY(osgshadergen)
     ADD_SUBDIRECTORY(osgshaderterrain)
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index f1ff8321b..1b6d8100b 100644
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -222,6 +222,7 @@ SET(TARGET_H
     ${HEADER_PATH}/VertexProgram
     ${HEADER_PATH}/View
     ${HEADER_PATH}/Viewport
+    ${HEADER_PATH}/ViewportIndexed
     ${OPENSCENEGRAPH_VERSION_HEADER}
     ${OPENSCENEGRAPH_CONFIG_HEADER}
     ${OPENSCENEGRAPH_OPENGL_HEADER}
@@ -388,6 +389,7 @@ SET(TARGET_SRC
     VertexProgram.cpp
     View.cpp
     Viewport.cpp
+    ViewportIndexed.cpp
 
     glu/libutil/error.cpp
     glu/libutil/mipmap.cpp
diff --git a/src/osg/ColorMaski.cpp b/src/osg/ColorMaski.cpp
index 1cae24a92..61e7c4f89 100644
--- a/src/osg/ColorMaski.cpp
+++ b/src/osg/ColorMaski.cpp
@@ -39,7 +39,7 @@ void ColorMaski::apply(State& state) const
     const GLExtensions* extensions = state.get<GLExtensions>();
     if (extensions->glColorMaski)
     {
-        extensions->glColorMaski((GLboolean)_index, (GLboolean)_red,(GLboolean)_green,(GLboolean)_blue,(GLboolean)_alpha);
+        extensions->glColorMaski((GLuint)_index, (GLboolean)_red,(GLboolean)_green,(GLboolean)_blue,(GLboolean)_alpha);
     }
     else
     {