diff --git a/analyzer/Makefile b/analyzer/Makefile
index f2ad2e935b..7bc8b88a2b 100644
--- a/analyzer/Makefile
+++ b/analyzer/Makefile
@@ -114,11 +114,8 @@ package: package_analyzer
 	${PYTHON_BIN} $(ROOT)/scripts/build/extend_version_file.py -r $(ROOT) \
 	  $(CC_BUILD_DIR)/config/analyzer_version.json \
 
-	# Copy CodeChecker entry point sub-commands.
-	${PYTHON_BIN} $(ROOT)/scripts/build/create_commands.py -b $(BUILD_DIR) \
-	  --cmd-dir $(ROOT)/codechecker_common/cli_commands \
-	    $(CC_ANALYZER)/codechecker_analyzer/cli \
-	  --bin-file $(ROOT)/bin/CodeChecker
+	# Copy CodeChecker binary.
+	cp $(ROOT)/bin/CodeChecker $(CC_BUILD_BIN_DIR)
 
 	# Copy license file.
 	cp $(ROOT)/LICENSE.TXT $(CC_BUILD_DIR)
diff --git a/web/Makefile b/web/Makefile
index 63f64aebff..ad969dae85 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -114,13 +114,8 @@ package: package_dir_structure package_web
 	${PYTHON_BIN} $(ROOT)/scripts/build/extend_version_file.py -r $(ROOT) \
 	  $(CC_BUILD_DIR)/config/web_version.json
 
-	# Copy CodeChecker entry point sub-commands.
-	${PYTHON_BIN} $(ROOT)/scripts/build/create_commands.py -b $(BUILD_DIR) \
-	  --cmd-dir $(ROOT)/codechecker_common/cli_commands \
-	    $(CC_WEB)/codechecker_web/cli \
-	    $(CC_SERVER)/codechecker_server/cli \
-	    $(CC_CLIENT)/codechecker_client/cli \
-	  --bin-file $(ROOT)/bin/CodeChecker
+	# Copy CodeChecker binary.
+	cp $(ROOT)/bin/CodeChecker $(CC_BUILD_BIN_DIR)
 
 	# Copy license file.
 	cp $(ROOT)/LICENSE.TXT $(CC_BUILD_DIR)