diff --git a/CMakeLists.txt b/CMakeLists.txt
index 408562b..ef0f645 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.5)
 
 # Project name and version
 project(eosio-keygen-extras
@@ -19,26 +19,45 @@ if (WIN32)
 	set( CMAKE_INSTALL_DATADIR "." )
 endif (WIN32)
 
-# --------------------------------
-#  Install target
-# --------------------------------
-install(
-	DIRECTORY dict
-	DESTINATION ${CMAKE_INSTALL_DATADIR}
+
+list(APPEND dictionaries 
+	english
+	danish
+	french
+	swedish
 )
 
+# --------------------------------
+#  Install targets
+# --------------------------------
+foreach(dict ${dictionaries})
+	install(FILES dict/${dict}
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/dict
+		COMPONENT ${dict})
+endforeach(dict ${dictionaries})
+
 # --------------------------------
 #  Package
 # --------------------------------
 set( CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 set( CPACK_PACKAGE_CONTACT ${PROJECT_MAINTAINER} )
 
+# Archive specific
+set( CPACK_ARCHIVE_COMPONENT_INSTALL TRUE )
+
 # Debian specific
+set( CPACK_DEB_COMPONENT_INSTALL TRUE )
 set( CPACK_DEBIAN_PACKAGE_DEPENDS "eosio-keygen" )
 set( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all" )
 set( CPACK_DEBIAN_PACKAGE_RELEASE "1" CACHE STRING "Debian release number" )
 set( CPACK_DEBIAN_PACKAGE_SECTION "extras" )
-set( CPACK_DEBIAN_FILE_NAME "${PROJECT_NAME}_${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb" )
+
+foreach(dict ${dictionaries})
+	string( TOUPPER ${dict} COMPONENT )
+	set( CPACK_DEBIAN_${COMPONENT}_PACKAGE_NAME "eosio-keygen-dict-${dict}" )
+	set( CPACK_DEBIAN_${COMPONENT}_FILE_NAME "${CPACK_DEBIAN_${COMPONENT}_PACKAGE_NAME}_${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+	set( CPACK_DEBIAN_${COMPONENT}_DESCRIPTION "${dict} language dictionary for eosio-keygen")
+endforeach(dict ${dictionaries})
 
 if (NOT CPACK_GENERATOR)
 	if (UNIX)