diff --git a/BuildLinuxCMake.sh b/BuildLinuxCMake.sh
index af63f34710..c36cb233fb 100755
--- a/BuildLinuxCMake.sh
+++ b/BuildLinuxCMake.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
-rm -rf linux_build
-mkdir linux_build
-pushd linux_build
+rm -rf build
+mkdir build
+pushd build
+cmake ..
 cmake ..
 make
-./StandAlone/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
+make install
+install/bin/glslangValidator -i ../Test/sample.vert ../Test/sample.frag
 popd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bbd8b8a9f..fd5dcc0399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 
+set(CMAKE_INSTALL_PREFIX install)
+
 project(glslang)
 
 add_subdirectory(glslang/MachineIndependent)
diff --git a/Install/Linux/glslangValidator b/Install/Linux/glslangValidator
index 5095ca1885..4c8bba0eb0 100755
Binary files a/Install/Linux/glslangValidator and b/Install/Linux/glslangValidator differ
diff --git a/Install/Linux/libglslang.so b/Install/Linux/libglslang.so
index 6dab3b934c..681f23f187 100755
Binary files a/Install/Linux/libglslang.so and b/Install/Linux/libglslang.so differ
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index dc68f105e9..fb988112b4 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -11,15 +11,18 @@ endif(WIN32)
 
 add_executable(glslangValidator StandAlone.cpp)
 
-target_link_libraries(glslangValidator
-                      glslang
-                      GenericCodeGen
-                      OSDependent
-                      Preprocessor
-                      OGLCompiler)
+set(LIBRARIES
+    glslang
+    GenericCodeGen
+    OSDependent
+    Preprocessor
+    OGLCompiler)
+
 if(UNIX)
-    target_link_libraries(${target_link_libraries} pthread)
+    set(LIBRARIES ${LIBRARIES} pthread)
 endif(UNIX)
 
+target_link_libraries(glslangValidator ${LIBRARIES})
+
 install(TARGETS glslangValidator
         RUNTIME DESTINATION bin)
diff --git a/Test/glslangValidator b/Test/glslangValidator
deleted file mode 100755
index 856aa1a995..0000000000
--- a/Test/glslangValidator
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-../build/install/bin/glslangValidator $*