diff --git a/manifests/client.pp b/manifests/client.pp
index ddce329..084c8db 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -32,6 +32,7 @@ class xymon::client (
   $service_managed            = $xymon::params::cli_service_managed,
   $service_name               = $xymon::params::cli_service_name,
   $service_default_path       = $xymon::params::cli_service_default_path,
+  $service_default_tpl        = $xymon::params::cli_service_default_tpl,
   $service_path               = $xymon::params::cli_service_path,
   $service_tpl                = $xymon::params::cli_service_tpl,
 ) inherits xymon::params {
diff --git a/manifests/client/config.pp b/manifests/client/config.pp
index 79d6846..40ad6a2 100644
--- a/manifests/client/config.pp
+++ b/manifests/client/config.pp
@@ -10,7 +10,14 @@ class xymon::client::config {
     mode  => 0644,
   }
 
-  file { "${xymon::client::service_path}":
+  # Service initscript
+  file { $xymon::client::service_default_path:
+    ensure  => present,
+    content => template($xymon::client::service_default_tpl),
+    notify  => Service[$xymon::client::service_name],
+  }
+  ->
+  file { $xymon::client::service_path:
     ensure  => present,
     mode    => 0754,
     content => template($xymon::client::service_tpl),
diff --git a/manifests/params.pp b/manifests/params.pp
index 71b83c6..e7e1474 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,6 +18,7 @@ class xymon::params {
       $cli_service_managed        = true
       $cli_service_name           = 'xymon-client'
       $cli_service_default_path   = '/etc/default/xymon-client'
+      $cli_service_default_tpl    = 'xymon/client/default.service.erb'
       $cli_service_path           = '/etc/init.d/xymon-client'
       $cli_service_tpl            = 'xymon/client/xymon-client.deb_service.erb'
 
diff --git a/templates/client/default.service.erb b/templates/client/default.service.erb
new file mode 100644
index 0000000..e69de29