diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 55f42ed89a..2cfb73d7c4 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -286,6 +286,7 @@ DEFAULT_CDROM_DEVICE_PREFIX = "hd"
 #    -i  Time in seconds of the monitorization push cycle. This parameter must
 #        be smaller than MONITORING_INTERVAL, otherwise push monitorization will
 #        not be effective.
+#    -w  Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 IM_MAD = [
       NAME       = "collectd",
@@ -297,6 +298,7 @@ IM_MAD = [
 #  KVM UDP-push Information Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of hosts monitored at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 IM_MAD = [
       NAME          = "kvm",
@@ -309,6 +311,7 @@ IM_MAD = [
 #  KVM SSH-pull Information Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of hosts monitored at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 # IM_MAD = [
 #       NAME          = "kvm",
@@ -321,6 +324,7 @@ IM_MAD = [
 #  vCenter Information Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of hosts monitored at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #IM_MAD = [
 #      NAME          = "vcenter",
@@ -333,6 +337,7 @@ IM_MAD = [
 #  EC2 Information Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of hosts monitored at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #IM_MAD = [
 #      NAME          = "ec2",
@@ -345,6 +350,7 @@ IM_MAD = [
 #  Azure Information Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of hosts monitored at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #IM_MAD = [
 #      NAME          = "az",
@@ -421,6 +427,7 @@ IM_MAD = [
 #        An example: "-l migrate=migrate_local,save"
 #    -p more than one action per host in parallel, needs support from hypervisor
 #    -s <shell> to execute remote commands, bash by default
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #
 #  Note: You can use type = "qemu" to use qemu emulated guests, e.g. if your
 #  CPU does not have virtualization extensions or use nested Qemu-KVM hosts
@@ -448,6 +455,7 @@ VM_MAD = [
 #    -s <shell> to execute commands, bash by default
 #    -d default snapshot strategy. It can be either 'detach' or 'suspend'. It
 #       defaults to 'suspend'.
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #VM_MAD = [
 #    NAME           = "vcenter",
@@ -468,6 +476,7 @@ VM_MAD = [
 #  EC2 Virtualization Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of actions performed at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #VM_MAD = [
 #    NAME           = "ec2",
@@ -487,6 +496,7 @@ VM_MAD = [
 #  Azure Virtualization Driver Manager Configuration
 #    -r number of retries when monitoring a host
 #    -t number of threads, i.e. number of actions performed at the same time
+#    -w Timeout in seconds to execute external commands (default unlimited)
 #-------------------------------------------------------------------------------
 #VM_MAD = [
 #    NAME           = "az",
@@ -523,6 +533,7 @@ VM_MAD = [
 #       -t: number of threads, i.e. number of transfers made at the same time
 #       -d: list of transfer drivers separated by commas, if not defined all the
 #           drivers available will be enabled
+#       -w: Timeout in seconds to execute external commands (default unlimited)
 #*******************************************************************************
 
 TM_MAD = [
@@ -542,6 +553,7 @@ TM_MAD = [
 #       -t number of threads, i.e. number of repo operations at the same time
 #       -d datastore mads separated by commas
 #       -s system datastore tm drivers, used to monitor shared system ds.
+#       -w Timeout in seconds to execute external commands (default unlimited)
 #*******************************************************************************
 
 DATASTORE_MAD = [
@@ -560,7 +572,8 @@ DATASTORE_MAD = [
 #   arguments : for the driver executable
 #       -t number of threads, i.e. number of repo operations at the same time
 #       -m marketplace mads separated by commas
-#  --proxy proxy address if required to access the internet
+#       --proxy proxy address if required to access the internet
+#       -w Timeout in seconds to execute external commands (default unlimited)
 #*******************************************************************************
 
 MARKET_MAD = [