diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index a345d3b864..08a6107aa6 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -55,7 +55,7 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
               list(REMOVE_ITEM files_list "${_current_item}")
             else()
               if ("${_file_type}" STREQUAL "*")
-                foreach(_mask "/\\.[^/]+$" "\\.in$" "\\.py$" "\\.patch$" "CMakeLists\\.txt$" "\\.lyx~$")
+                foreach(_mask "/\\.[^/]+$" "\\.in$" "\\.py$" "\\.patch$" "CMakeLists\\.txt$" "\\.lyx~$" "Attic")
                   if(_current_item MATCHES ${_mask})
                     #message(STATUS "removing item ${_current_item}")
                     list(REMOVE_ITEM files_list "${_current_item}")
@@ -106,7 +106,9 @@ lyx_install("data" ${TOP_SRC_DIR}/lib doc          *      biblio clipart)
 
 lyx_install("data" ${TOP_SRC_DIR}/lib doc/${_all_languages} *    clipart)
 
-lyx_install("data" ${TOP_SRC_DIR}/lib examples     *      . ${_all_languages} springer thesis)
+set(example_subdirs ${_all_languages} pt_BR pt_PT Articles Curricula_Vitae External_Material "Graphics_\&_Insets" Handouts Letters Modules Posters Presentations Scripts Theses Books Theses)
+lyx_install("data" ${TOP_SRC_DIR}/lib examples     *    . *)
+lyx_install("data" ${TOP_SRC_DIR}/lib examples/*   *    . *)
 lyx_install("font" ${TOP_SRC_DIR}/lib/fonts .      *      .)
 foreach(_imgext "png" "svgz" "gif" "xpm")
   lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . ipa commands attic classic oxygen)
@@ -119,7 +121,8 @@ lyx_install("data" ${TOP_SRC_DIR}/lib scripts      *.py   .)
 lyx_install("data" ${TOP_SRC_DIR}/lib citeengines  *.citeengine .)
 lyx_install("data" ${TOP_SRC_DIR}/lib .            *.py   .)
 lyx_install("data" ${TOP_SRC_DIR}/lib scripts      *.R    .)
-lyx_install("data" ${TOP_SRC_DIR}/lib templates    *      . springer)
+lyx_install("data" ${TOP_SRC_DIR}/lib templates    *      . *)
+lyx_install("data" ${TOP_SRC_DIR}/lib templates/*  *      . *)
 lyx_install("data" ${TOP_SRC_DIR}/lib xtemplates  *.xtemplate .)
 lyx_install("tex"  ${TOP_SRC_DIR}/lib/tex .        *      .)
 lyx_install("data" ${TOP_SRC_DIR}/lib ui           *      .)