diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f02ed972..3977774c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,4 +57,11 @@ configure_file (
 
 add_subdirectory (src)
 add_subdirectory (doc)
+add_subdirectory (i18n)
+add_subdirectory (scripts)
 add_subdirectory (test EXCLUDE_FROM_ALL)
+
+set (doc_FILES NEWS ChangeLog README README.build INSTALL AUTHORS COPYING)
+foreach (doc_FILE ${doc_FILES})
+  install (FILES ${doc_FILE}  DESTINATION share/doc/task)
+endforeach (doc_FILE)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f00589c9c..b529ddf96 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,10 +1,3 @@
-#set (man5_FILES taskrc.5 task-color.5 task-faq.5 task-sync.5 task-tutorial.5)
-#set (man5_DIR share/man/man5)
-
-#foreach (man_FILE ${man5_FILES})
-#  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/${man_FILE}   DESTINATION ${man5_DIR})
-#endforeach (man_FILE)
-
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man1
                                                     FILES_MATCHING PATTERN "*.1")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man5
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
index e69de29bb..8507f7b8e 100644
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -0,0 +1,4 @@
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/i18n
+                                                FILES_MATCHING REGEX "strings.*"
+                                                               REGEX "tips.*"
+                                                               PATTERN "CMakeFiles" EXCLUDE)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e69de29bb..33e520b07 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -0,0 +1,2 @@
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/scripts
+                                                FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE)