diff --git a/files/image_config/bash/bash.bashrc b/files/image_config/bash/bash.bashrc
index f59cc1bf64..d65beb5b08 100644
--- a/files/image_config/bash/bash.bashrc
+++ b/files/image_config/bash/bash.bashrc
@@ -53,3 +53,6 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no
         fi
     }
 fi
+
+# enable auto-logout for console ttyS* sessions
+tty | grep ttyS >/dev/null && TMOUT=300