diff --git a/kas/libkas.py b/kas/libkas.py
index 8392102..7b2f14d 100644
--- a/kas/libkas.py
+++ b/kas/libkas.py
@@ -170,7 +170,8 @@ def get_oe_environ(config, build_dir):
         ew = env['BB_ENV_EXTRAWHITE'] + ' '.join(vars)
         env.update({'BB_ENV_EXTRAWHITE': ew})
 
-    vars.extend(['SSH_AGENT_PID', 'SSH_AUTH_SOCK'])
+    vars.extend(['SSH_AGENT_PID', 'SSH_AUTH_SOCK',
+                 'SHELL', 'TERM'])
 
     for v in vars:
         if v in os.environ:
diff --git a/kas/shell.py b/kas/shell.py
index 5120d69..688ab91 100644
--- a/kas/shell.py
+++ b/kas/shell.py
@@ -73,7 +73,7 @@ class ShellCommand(Command):
         return 'shell'
 
     def execute(self, config):
-        cmd = ['/bin/sh']
+        cmd = [config.environ.get('SHELL', '/bin/sh')]
         if self.cmd:
             cmd.append('-c')
             cmd.append(self.cmd)