diff --git a/installer/build.sh b/installer/build.sh
index c996681..bc81126 100755
--- a/installer/build.sh
+++ b/installer/build.sh
@@ -1,6 +1,7 @@
 cd slave
 echo "Copying needed files for slave SFX..."
 cp ../../runhelper/runhelper .
+cp ../../command_daemon/command_daemon .
 cp ../../console/slave/dropper .
 cp ../../logshell/logshell .
 cp ../../logshell/cvmshell .
diff --git a/installer/slave/install.py b/installer/slave/install.py
index a64b499..19c8f11 100644
--- a/installer/slave/install.py
+++ b/installer/slave/install.py
@@ -229,12 +229,17 @@ sys.stdout.write("Lock on /etc/group removed.\n")
 # Create the main CVM data directories
 setuplib.create_directory("/etc/cvm", True, 0, cvm_gid, "u+rwx g+rwx o+rx")
 setuplib.create_directory("/etc/cvm/log", True, 0, 0, "u+rwx")
+setuplib.create_directory("/etc/cvm/command_daemon", True, 0, 0, "u+rwx")
 sys.stdout.write("Created directories.\n")
 
 # Copy the runhelper
 setuplib.copy_file("runhelper", "/home/cvm/runhelper", True, cvm_uid, cvm_gid, "u+rwx")
 sys.stdout.write("Installed runhelper.\n")
 
+# Copy the command daemon
+setuplib.copy_file("command_daemon", "/etc/cvm/command_daemon/command_daemon", True, cvm_uid, cvm_gid, "u+rwx")
+sys.stdout.write("Installed command daemon.\n")
+
 if enable_dropper == "y":
 	# Copy the shell dropper
 	setuplib.copy_file("dropper", "/home/vz/dropper", True, vz_uid, vz_gid, "u+rwx")