diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index c2532b87302b4c937731e99d9f3ad46506f044c3..9f293a2942d8dcfe6b60c1a0aafa678e99f4ed26 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,7 +1,4 @@
-option(ENABLE_DIST "Enable install of init scripts" OFF)
-if (ENABLE_DIST)
-    add_subdirectory(dist)
-endif()
+add_subdirectory(dist)
 
 if (TARGET_OS_DARWIN)
 	# NOTE: need add execution 'plutil -lint org.tarantool.tarantool.plist
diff --git a/extra/dist/CMakeLists.txt b/extra/dist/CMakeLists.txt
index f8024526f63a14ae3ad0036ffaa82adfe464432b..b293314a74fb311202be6db4855f9c87705fff98 100644
--- a/extra/dist/CMakeLists.txt
+++ b/extra/dist/CMakeLists.txt
@@ -1,3 +1,21 @@
+# config file for tarantoolctl
+if (TARGET_OS_FREEBSD)
+    set(SYSCONFIG_DEFAULT "tarantool/default")
+elseif (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig")
+    # Debian/Ubuntu/etc.
+    set(SYSCONFIG_DEFAULT "default")
+else()
+    # RedHat/Fedora/etc.
+    set(SYSCONFIG_DEFAULT "sysconfig")
+endif()
+configure_file(tarantoolctl.in tarantoolctl @ONLY)
+
+option(ENABLE_DIST "Enable install of init scripts" OFF)
+
+if (NOT ENABLE_DIST)
+    return ()
+endif()
+
 include(systemd)
 
 #
@@ -21,18 +39,7 @@ set(SYSCONFIG_ENABLEDDIR "tarantool/instances.enabled")
 set(TARANTOOL_AVAILABLEDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${SYSCONFIG_AVAILABLEDIR}")
 set(TARANTOOL_ENABLEDDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${SYSCONFIG_ENABLEDDIR}")
 
-# config file for tarantoolctl
-if (TARGET_OS_FREEBSD)
-    set(SYSCONFIG_DEFAULT "tarantool/default")
-elseif (NOT IS_DIRECTORY "${CMAKE_INSTALL_SYSCONFDIR}/sysconfig")
-    # Debian/Ubuntu/etc.
-    set(SYSCONFIG_DEFAULT "default")
-else()
-    # RedHat/Fedora/etc.
-    set(SYSCONFIG_DEFAULT "sysconfig")
-endif()
 configure_file(default/tarantool.in default/tarantool @ONLY)
-configure_file(tarantoolctl.in tarantoolctl @ONLY)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/default/tarantool DESTINATION
     ${CMAKE_INSTALL_SYSCONFDIR}/${SYSCONFIG_DEFAULT}/
     PERMISSIONS