diff --git a/README.rst b/README.rst
index ddf253f..fbab424 100644
--- a/README.rst
+++ b/README.rst
@@ -208,6 +208,7 @@
         terminal_timeout: 10
         subprocess_checking_interval: 1
         subprocess_timeout: 10
+        kill_timeout: 1
         socat_address: 127.0.0.1
 
 You can read more info about it here:
diff --git a/ironic/files/queens/ironic.conf b/ironic/files/queens/ironic.conf
index 8eb5ff6..81394e8 100644
--- a/ironic/files/queens/ironic.conf
+++ b/ironic/files/queens/ironic.conf
@@ -1262,6 +1262,15 @@
 #subprocess_timeout = 10
 {%- endif %}
 
+# Time (in seconds) to wait for the shellinabox console
+# subprocess to exit before sending SIGKILL signal. (integer
+# value)
+{%- if conductor.get('console', {}).kill_timeout is defined %}
+kill_timeout = {{ conductor.console.kill_timeout }}
+{%- else %}
+#kill_timeout = 1
+{%- endif %}
+
 # IP address of Socat service running on the host of ironic
 # conductor. Used only by Socat console. (IP address value)
 {%- if conductor.get('console', {}).socat_address is defined %}