diff --git a/openssh/files/sshd_config b/openssh/files/sshd_config
index 62ce97b..75df57d 100644
--- a/openssh/files/sshd_config
+++ b/openssh/files/sshd_config
@@ -66,6 +66,10 @@
 {{ option_default_uncommented('SyslogFacility', 'AUTH') }}
 {{ option_default_uncommented('LogLevel', 'INFO') }}
 
+# Session idle time out
+{{ option_default_uncommented('ClientAliveInterval', 0) }}
+{{ option_default_uncommented('ClientAliveCountMax', 3) }}
+
 # Authentication:
 {{ option_default_uncommented('LoginGraceTime', 120) }}
 {{ option_default_uncommented('PermitRootLogin', 'yes') }}
diff --git a/pillar.example b/pillar.example
index 4895add..d678fde 100644
--- a/pillar.example
+++ b/pillar.example
@@ -11,6 +11,8 @@ sshd_config:
   ServerKeyBits: 768
   SyslogFacility: AUTH
   LogLevel: INFO
+  ClientAliveInterval: 0
+  ClientAliveCountMax: 3
   LoginGraceTime: 120
   PermitRootLogin: 'yes'
   PasswordAuthentication: 'no'