diff --git a/CMakeLists.txt b/CMakeLists.txt
index 594c5f4c..ad065543 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,10 @@ install(TARGETS ${PROJECT_NAME}
             ARCHIVE DESTINATION lib
             LIBRARY DESTINATION lib)
 
+# Install include directories too.
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/nana
+        DESTINATION include)
+
 set_property( TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14 )
 
 # TODO: move this nana-demo section to the nana demo repository, and here only include that cmake file
diff --git a/include/nana/filesystem/filesystem_selector.hpp b/include/nana/filesystem/filesystem_selector.hpp
index b2a02293..7d18115f 100644
--- a/include/nana/filesystem/filesystem_selector.hpp
+++ b/include/nana/filesystem/filesystem_selector.hpp
@@ -60,6 +60,8 @@ namespace std {
 	} // experimental
 } // std
 
+#elif (__GNUC__)
+#    include <experimental/filesystem>
 #else
 #    include <filesystem>
 #endif