diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02ce7a0..44ac2c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,3 +5,4 @@
 * Install `xymon-client` packages for Debian based distros.
 * Manage `xymon-client` default configuration file.
 * Manage `xymon-client` service.
+* Add possibility to set the value of CLIENTHOSTNAME `xymon-client` value.
diff --git a/README.md b/README.md
index ed35573..6c0c917 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Manage Xymon (client) installation and configuration.
 * **xymon_cli_pkg_state** : State of new `xymon-client` package(s) [default : `installed`].
 * **xymon_cli_default_conf_path** : Configuration file for `xymon-client` [default : `/etc/default/xymon-client`].
 * **xymon_cli_default_conf_tpl** : Template used to generate the previous config file [default : `etc/default/xymon-client.j2`].
+* **xymon_cli_hostname** : Allow to override default value of CLIENTHOSTNAME var [default : `{{ ansible_fqdn }}`].
 * **xymon_cli_service_manage** : If `xymon-client` service should be managed with this role [default : `true`].
 * **xymon_cli_service_name** : `xymon-client` service name [default : `xymon-client`].
 * **xymon_cli_service_enabled** : Set `xymon-client` service available at startup [default : `true`].
diff --git a/defaults/main.yml b/defaults/main.yml
index 0f1ff2d..19f63c5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,6 +9,7 @@ xymon_cli_pkg_state: 'installed'
 ## conf
 xymon_cli_default_conf_path: '/etc/default/xymon-client'
 xymon_cli_default_conf_tpl: 'etc/default/xymon-client.j2'
+xymon_cli_hostname: "{{ ansible_fqdn }}"
 
 ## service
 xymon_cli_service_manage: true
diff --git a/templates/etc/default/xymon-client.j2 b/templates/etc/default/xymon-client.j2
index 6ef8e89..200c7aa 100644
--- a/templates/etc/default/xymon-client.j2
+++ b/templates/etc/default/xymon-client.j2
@@ -20,7 +20,7 @@ XYMONSERVERS="127.0.0.1"
 # CLIENTHOSTNAME=""
 # CLIENTOS="rhel3"
 
-CLIENTHOSTNAME="hostname.domain.local"
+CLIENTHOSTNAME="{{ xymon_cli_hostname }}"
 
 # Optionally mount a tmpfs on /var/lib/xymon/tmp. On client systems this has
 # the advantage that client reports will continue to work even if the /var