diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f430136..43aa9b9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Added
 
+* evolinux-base: session timeout is configurable (default: 36000 seconds = 10 hours)
 * haproxy: add haproxy_allow_ip_nonlocal_bind to set sysctl value (optional)
 * openvpn: configure logrotate
 * kvm-host: fix depreciation of "drbd-overview" by "drbdadm status" in add-vm.sh
diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 6f28fd5e..ee307015 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -107,6 +107,7 @@ evolinux_system_profile: True
 evolinux_system_dirmode_adduser: True
 evolinux_system_restrict_securetty: False
 evolinux_system_set_timeout: True
+evolinux_system_timeout: 36000
 evolinux_system_cron_verboselog: True
 evolinux_system_cron_umask: True
 evolinux_system_cron_random: True
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index e5363fed..5d71e827 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -77,7 +77,8 @@
 - name: Setting TMOUT to disconnect inactive users
   lineinfile:
     dest: /etc/profile.d/evolinux.sh
-    line: "export TMOUT=36000"
+    line: "export TMOUT={{ evolinux_system_timeout }}"
+    regexp: "^export TMOUT="
     create: yes
     state: present
   when: evolinux_system_set_timeout | bool