diff --git a/mach b/mach
index e0073fc7ae7..c6efe1a9411 100755
--- a/mach
+++ b/mach
@@ -110,6 +110,7 @@ if __name__ == '__main__':
         import subprocess
         from shlex import quote
         mach_dir = os.path.abspath(os.path.dirname(__file__))
+        print('NOTE: Entering nix-shell etc/shell.nix')
         try:
             # sys argv already contains the ./mach part, so we just need to pass it as-is
             subprocess.Popen(['nix-shell', mach_dir + '/etc/shell.nix', '--run', ' '.join(map(quote, sys.argv))]).wait()
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py
index 21fcd967693..92068f3519b 100644
--- a/python/servo/bootstrap.py
+++ b/python/servo/bootstrap.py
@@ -400,8 +400,12 @@ def bootstrap(context, force=False, specific=None):
         distrib, version = get_linux_distribution()
 
         if distrib.lower() == 'nixos':
-            print('NixOS does not need bootstrap')
-            print('just run ./mach build')
+            print('NixOS does not need bootstrap, it will automatically enter a nix-shell')
+            print('Just run ./mach build')
+            print('')
+            print('You will need to run a nix-shell if you are trying to run any of the built binaries')
+            print('To enter the nix-shell manually use:')
+            print('  $ nix-shell etc/shell.nix')
             return
 
         context.distro = distrib