diff --git a/manifests/params.pp b/manifests/params.pp
index 6c6192a84..d4115e6c1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -84,7 +84,6 @@
 
     'linux': {
       $icinga2_bin          = 'icinga2'
-      $bin_dir              = '/sbin'
       $conf_dir             = '/etc/icinga2'
       $log_dir              = '/var/log/icinga2'
       $run_dir              = '/var/run/icinga2'
@@ -102,6 +101,7 @@
         'redhat': {
           $user    = 'icinga'
           $group   = 'icinga'
+          $bin_dir = '/sbin'
           $lib_dir = $::architecture ? {
             'x86_64' => '/usr/lib64',
             default  => '/usr/lib',
@@ -109,15 +109,17 @@
         } # RedHat
 
         'debian': {
-          $user     = 'nagios'
-          $group    = 'nagios'
-          $lib_dir  = '/usr/lib'
+          $user    = 'nagios'
+          $group   = 'nagios'
+          $bin_dir = '/usr/sbin'
+          $lib_dir = '/usr/lib'
         } # Debian
 
         'suse': {
-          $user     = 'icinga'
-          $group    = 'icinga'
-          $lib_dir  = '/usr/lib'
+          $user    = 'icinga'
+          $group   = 'icinga'
+          $bin_dir = '/usr/sbin'
+          $lib_dir = '/usr/lib'
         } # Suse
 
         default: {
@@ -136,7 +138,6 @@
     } # Linux
 
     'windows': {
-      #$user                 = 'SYSTEM'
       $user                 = undef
       $group                = undef
       $icinga2_bin          = 'icinga2.exe'
@@ -165,6 +166,7 @@
     } # Windows
 
     'FreeBSD': {
+      $bin_dir              = '/usr/local/sbin/icinga2'
       $conf_dir             = '/usr/local/etc/icinga2'
       $log_dir              = '/var/log/icinga2'
       $run_dir              = '/var/run/icinga2'
@@ -174,6 +176,7 @@
       $ca_dir               = '/var/lib/icinga2/ca'
       $user                 = 'icinga'
       $group                = 'icinga'
+      $icinga2_bin          = 'icinga2'
       $lib_dir              = '/usr/local/lib/icinga2'
       $ido_pgsql_package    = undef
       $ido_pgsql_schema_dir = '/usr/local/share/icinga2-ido-pgsql/schema'