diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index c8a5a3cc76..d60e8e3678 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~$" "Attic")
+                foreach(_mask "/\\.[^/]+$" "\\.in$" "\\.py$" "\\.patch$" "CMakeLists\\.txt$" "\\.lyx~$")
                   if(_current_item MATCHES ${_mask})
                     #message(STATUS "removing item ${_current_item}")
                     list(REMOVE_ITEM files_list "${_current_item}")
@@ -108,28 +108,29 @@ foreach(_lang ${_all_languages})
   lyx_install("data" ${TOP_SRC_DIR}/lib doc/${_lang} *    clipart)
 endforeach()
 
-set(example_subdirs ${_all_languages} Articles Curricula_Vitae External_Material "Graphics_and_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(_sd "examples" "templates")
+  lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}     *    . *)
+  lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}/*   *    . *)
+endforeach()
+
+foreach(_sd "kbd" "layouts" "ui" ".")
+  lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}     *    .  )
+endforeach()
+
+foreach(_sd "lyx2lyx" "scripts" ".")
+  lyx_install("data" ${TOP_SRC_DIR}/lib ${_sd}     *.py .  )
+endforeach()
+
 foreach(_imgext "png" "svgz" "gif" "xpm")
-  lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . ipa commands attic classic oxygen)
+  lyx_install("data" ${TOP_SRC_DIR}/lib images       "*.${_imgext}"      . ipa classic oxygen)
   lyx_install("data" ${TOP_SRC_DIR}/lib images/math  "*.${_imgext}"      . oxygen)
 endforeach()
-lyx_install("data" ${TOP_SRC_DIR}/lib kbd          *      .)
-lyx_install("data" ${TOP_SRC_DIR}/lib layouts      *      .)
-lyx_install("data" ${TOP_SRC_DIR}/lib lyx2lyx      *.py   .)
-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    *      . *)
-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           *      .)
-lyx_install("data" ${TOP_SRC_DIR}/lib .            *      .)
-lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync            *      .)
+lyx_install("data" ${TOP_SRC_DIR}/lib        citeengines          *.citeengine .)
+lyx_install("data" ${TOP_SRC_DIR}/lib        scripts              *.R          .)
+lyx_install("data" ${TOP_SRC_DIR}/lib        xtemplates           *.xtemplate  .)
+lyx_install("data" ${TOP_SRC_DIR}/3rdparty   scripts/evince_sync  *            .)
+lyx_install("font" ${TOP_SRC_DIR}/lib/fonts  .                    *            .)
+lyx_install("tex"  ${TOP_SRC_DIR}/lib/tex    .                    *            .)
 
 # Install
 set(lyxrcorig "")