diff --git a/includes.container/usr/bin/vso-os-shell b/includes.container/usr/bin/vso-os-shell
new file mode 100644
index 0000000..d7484bb
--- /dev/null
+++ b/includes.container/usr/bin/vso-os-shell
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -d ~/.vso-os-shell/history ]; then
+    mkdir -p ~/.vso-os-shell/history
+fi
+
+echo "(`date +%Y%m%d-%H:%M:%S`) -> $@" >> ~/.vso-os-shell/history/`date +%Y%m%d`.log
+/usr/bin/vso run /usr/bin/os-shell "$@"
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
index 55a9a66..32be5df 100644
--- a/modules/00-vanilla-system-operator.yml
+++ b/modules/00-vanilla-system-operator.yml
@@ -16,6 +16,11 @@ modules:
     url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/continuous/vso-man.tar.gz
   commands:
   - mv /sources/man/vso.1 /usr/share/man/man1/
+- name: vso-os-shell
+  type: shell
+  commands:
+  - chmod +x /usr/bin/vso-os-shell
+  - echo "/usr/bin/vso-os-shell" >> /etc/shells
 - name: vso-deps-install
   type: apt
   source: