diff --git a/fuel_dev_tools/docker/mcollective.py b/fuel_dev_tools/docker/mcollective.py
index df3b3b7..d5aa034 100644
--- a/fuel_dev_tools/docker/mcollective.py
+++ b/fuel_dev_tools/docker/mcollective.py
@@ -28,7 +28,7 @@ class DockerMcollectiveMixin(object):
 
 
 class RsyncAgent(DockerMcollectiveMixin, docker.RsyncCommand):
-    """Rsync files to the Docker container."""
+    """Rsync mcagent files to the Docker container."""
     @property
     def source_path(self):
         return '.'
@@ -40,3 +40,20 @@ class RsyncAgent(DockerMcollectiveMixin, docker.RsyncCommand):
     def post_sync(self, parsed_args):
         self.restart_container()
 
+
+class RsyncShotgun(DockerMcollectiveMixin, docker.RsyncCommand):
+    """Rsync shotgun files to the Docker container."""
+    @property
+    def source_path(self):
+        return 'shotgun/shotgun'
+
+    @property
+    def target_path(self):
+        return 'usr/lib/python2.6/site-packages/shotgun'
+
+    def post_sync(self, parsed_args):
+        self.restart_container()
+
+
+class Shell(DockerMcollectiveMixin, docker.ShellCommand):
+    """Shell into the container."""
diff --git a/fuel_dev_tools/shell.py b/fuel_dev_tools/shell.py
index 49c317c..9aecc96 100644
--- a/fuel_dev_tools/shell.py
+++ b/fuel_dev_tools/shell.py
@@ -28,6 +28,7 @@ from cliff import app
 from cliff import commandmanager
 
 from fuel_dev_tools.docker import astute
+from fuel_dev_tools.docker import mcollective
 from fuel_dev_tools.docker import nailgun
 from fuel_dev_tools.docker import nginx
 from fuel_dev_tools.docker import postgres
@@ -57,6 +58,9 @@ COMMANDS = {
 
     'mcagent-rsync': mcagent.Rsync,
 
+    'mcollective-rsync-shotgun': mcollective.RsyncShotgun,
+    'mcollective-shell': mcollective.Shell,
+
     'nailgun-id': nailgun.Id,
     'nailgun-config': nailgun.Config,
     'nailgun-db-reset': nailgun.DBReset,