diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index c538e84..6ece1ab 100755
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS)
 endif(ENABLE_AMD_EXTENSIONS)
 
 if(ENABLE_NV_EXTENSIONS)
-    set(HEADERS
-        GLSL.ext.NV.h)
+    list(APPEND
+         HEADERS
+         GLSL.ext.NV.h)
 endif(ENABLE_NV_EXTENSIONS)
 
 add_library(SPIRV STATIC ${SOURCES} ${HEADERS})
@@ -51,3 +52,5 @@ endif(WIN32)
 
 install(TARGETS SPIRV SPVRemapper
         ARCHIVE DESTINATION lib)
+
+install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/)
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 95d4bdd..e7fda90 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -93,3 +93,8 @@ endif(WIN32)
 
 install(TARGETS glslang 
         ARCHIVE DESTINATION lib)
+
+foreach(file ${HEADERS})
+    get_filename_component(dir ${file} DIRECTORY)
+    install(FILES ${file} DESTINATION include/glslang/${dir})
+endforeach()