diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4c1b5bbb..860aacb3a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,3 +227,5 @@ set(CMAKE_EXE_LINKER_FLAGS "${default_linker_flags}" CACHE INTERNAL "")
 target_include_directories(scylla PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}"
     "${scylla_gen_build_dir}")
+
+add_subdirectory(dist)
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
new file mode 100644
index 0000000000..601570a67a
--- /dev/null
+++ b/dist/CMakeLists.txt
@@ -0,0 +1,86 @@
+set(unstripped_dist_pkg
+  ${Scylla_PRODUCT}-unstripped-${Scylla_VERSION}-${Scylla_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}.tar.gz)
+add_custom_command(
+  OUTPUT ${unstripped_dist_pkg}
+  COMMAND script/create-relocatable-package.py --mode ${CMAKE_BUILD_TYPE} ${unstripped_dist_pkg}
+  DEPENDS
+    scylla
+    iotune
+    ${CMAKE_BINARY_DIR}/debian/debian
+    ${CMAKE_BINARY_DIR}/node_exporter/node_exporter)
+
+function(add_stripped name)
+  set(output ${name}.stripped)
+  if(TARGET ${name})
+    add_custom_command(
+      OUTPUT ${CMAKE_BINARY_DIR}/${name}.stripped
+      COMMAND ${CMAKE_SOURCE_DIR}/scripts/strip.sh $<TARGET_FILE:${name}>
+      DEPENDS ${name})
+  else()
+    # ${name} must be an absolute path
+    add_custom_command(
+      OUTPUT ${name}.stripped
+      COMMAND ${CMAKE_SOURCE_DIR}/scripts/strip.sh ${name}
+      DEPENDS ${name})
+  endif()
+endfunction()
+
+add_stripped(scylla)
+
+# app_iotune is located in seastar/apps/iotune
+add_custom_command(
+  OUTPUT ${CMAKE_BINARY_DIR}/iotune
+  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:app_iotune> ${CMAKE_BINARY_DIR}/iotune
+  DEPENDS app_iotune)
+add_stripped(${CMAKE_BINARY_DIR}/iotune)
+
+find_program(TAR_COMMAND tar
+  REQUIRED)
+execute_process(
+  COMMAND
+    ${CMAKE_SOURCE_DIR}/install-dependencies.sh --print-node-exporter-filename
+  OUTPUT_VARIABLE
+    node_exporter_filename
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+add_custom_command(
+  OUTPUT
+    ${CMAKE_BINARY_DIR}/node_exporter/node_exporter
+  COMMAND
+    ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/node_exporter
+  COMMAND
+    ${TAR_COMMAND}
+      -C ${CMAKE_BINARY_DIR}/node_exporter
+      -xpf ${node_exporter_filename}
+      --no-same-owner
+      --strip-components=1)
+add_stripped(${CMAKE_BINARY_DIR}/node_exporter/node_exporter)
+
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/debian
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/debian/debian_files_gen.py
+    --build-dir ${CMAKE_BINARY_DIR}
+    --output-dir ${CMAKE_CURRENT_BINARY_DIR}/debian
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+set(stripped_dist_pkg
+  "${CMAKE_BINARY_DIR}/${Scylla_PRODUCT}-${Scylla_VERSION}-${Scylla_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}.tar.gz")
+add_custom_command(
+  OUTPUT
+    ${stripped_dist_pkg}
+  COMMAND
+    ${CMAKE_SOURCE_DIR}/scripts/create-relocatable-package.py
+      --stripped
+      --build-dir ${CMAKE_BINARY_DIR}
+      --node-exporter-dir ${CMAKE_BINARY_DIR}/node_exporter
+      ${stripped_dist_pkg}
+  DEPENDS
+    ${CMAKE_BINARY_DIR}/scylla.stripped
+    ${CMAKE_BINARY_DIR}/iotune.stripped
+    ${CMAKE_BINARY_DIR}/node_exporter/node_exporter.stripped
+    ${CMAKE_CURRENT_BINARY_DIR}/debian
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+add_custom_target(dist-server-tar
+  DEPENDS ${stripped_dist_pkg})
+add_custom_target(package
+  ${CMAKE_COMMAND} -E copy ${stripped_dist_pkg} ${Scylla_PRODUCT}-package.tar.gz
+  DEPENDS ${stripped_dist_pkg})