diff --git a/manifests/init.pp b/manifests/init.pp
index c076b63..2088bf3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,207 +1,213 @@
 # Class: sudo
 #
 # This module manages sudo
 #
 # Parameters:
 #   [*ensure*]
 #     Ensure if present or absent.
 #     Default: present
 #
 #   [*package*]
 #     Name of the package.
 #     Only set this, if your platform is not supported or you know,
 #     what you're doing.
 #     Default: auto-set, platform specific
 #
 #   [*package_ensure*]
 #     Allows you to ensure a particular version of a package
 #     Default: present / lastest for RHEL < 5.5
 #
 #   [*package_source*]
 #     Where to find the package.  Only set this on AIX (required) and
 #     Solaris (required) or if your platform is not supported or you
 #     know, what you're doing.
 #
 #     The default for aix is the perzl sudo package. For solaris 10 we
 #     use the official www.sudo.ws binary package.
 #
 #     Default: AIX: perzl.org
 #              Solaris: www.sudo.ws
 #
+#   [*package_provider_override*]
+#     Allows you to override the default package provider.
+#     Default: rpm
+#
 #   [*package_admin_file*]
 #     Where to find a Solaris 10 package admin file for
 #     an unattended installation. We do not supply a default file, so
 #     this has to be staged separately
 #
 #     Only set this on Solaris 10 (required)
 #     Default: /var/sadm/install/admin/puppet
 #
 #   [*purge*]
 #     Whether or not to purge sudoers.d directory
 #     Default: true
 #
 #   [*purge_ignore*]
 #     Files to exclude from purging in sudoers.d directory
 #     Default: undef
 #
 #   [*config_file*]
 #     Main configuration file.
 #     Only set this, if your platform is not supported or you know,
 #     what you're doing.
 #     Default: auto-set, platform specific
 #
 #   [*config_dir*]
 #     Main directory containing sudo snippets, imported via
 #     includedir stanza in sudoers file
 #     Default: auto-set, platform specific
 #
 #   [*extra_include_dirs*]
 #     Array of additional directories containing sudo snippets
 #     Default: undef
 #
 #   [*content*]
 #     Alternate content file location
 #     Only set this, if your platform is not supported or you know,
 #     what you're doing.
 #     Default: auto-set, platform specific
 #
 #   [*ldap_enable*]
 #     Enable ldap support on the package
 #     Default: false
 #
 #   [*delete_on_error*]
 #     True if you want that the configuration is deleted on an error
 #     during a complete visudo -c run. If false it will just return
 #     an error and will add a comment to the sudoers configuration so
 #     that the resource will be checked at the following run.
 #     Default: true
 #
 #   [*validate_single*]
 #     Do a validate on the "single" file in the sudoers.d directory.
 #     If the validate fail the file will not be saved or changed
 #     if a file already exist.
 #     Default: false
 #
 #   [*use_sudoreplay*]
 #     Boolean to enable the usage of sudoreplay.
 #     Default: false
 #
 #   [*sudoreplay_discard*]
 #     Array of additional command to discard in sudo log.
 #     Default: undef
 #
 #   [*configs*]
 #     A hash of sudo::conf's
 #     Default: {}
 #
 # Actions:
 #   Installs sudo package and checks the state of sudoers file and
 #   sudoers.d directory.
 #
 # Requires:
 #   Nothing
 #
 # Sample Usage:
 #   class { 'sudo': }
 #
 # [Remember: No empty lines between comments and class definition]
 class sudo (
-  Boolean                                   $enable              = true,
-  Optional[String]                          $package             = $sudo::params::package,
-  Optional[String]                          $package_ldap        = $sudo::params::package_ldap,
-  String                                    $package_ensure      = $sudo::params::package_ensure,
-  Optional[String]                          $package_source      = $sudo::params::package_source,
-  Optional[String]                          $package_admin_file  = $sudo::params::package_admin_file,
-  Boolean                                   $purge               = true,
-  Optional[Variant[String, Array[String]]]  $purge_ignore        = undef,
-  String                                    $config_file         = $sudo::params::config_file,
-  Boolean                                   $config_file_replace = true,
-  String                                    $config_file_mode    = $sudo::params::config_file_mode,
-  String                                    $config_dir          = $sudo::params::config_dir,
-  String                                    $config_dir_mode     = $sudo::params::config_dir_mode,
-  Optional[Array[String]]                   $extra_include_dirs  = undef,
-  String                                    $content             = $sudo::params::content,
-  Boolean                                   $ldap_enable         = false,
-  Boolean                                   $delete_on_error     = true,
-  Boolean                                   $validate_single     = false,
-  Boolean                                   $config_dir_keepme   = $sudo::params::config_dir_keepme,
-  Boolean                                   $use_sudoreplay      = false,
-  Optional[Array[String]]                   $sudoreplay_discard  = undef,
-  Hash                                      $configs             = {},
+  Boolean                                   $enable                    = true,
+  Optional[String]                          $package                   = $sudo::params::package,
+  Optional[String]                          $package_ldap              = $sudo::params::package_ldap,
+  String                                    $package_ensure            = $sudo::params::package_ensure,
+  Optional[String]                          $package_source            = $sudo::params::package_source,
+  Optional[String]                          $package_provider_override = $sudo::params::package_provider_override,
+  Optional[String]                          $package_admin_file        = $sudo::params::package_admin_file,
+  Boolean                                   $purge                     = true,
+  Optional[Variant[String, Array[String]]]  $purge_ignore              = undef,
+  String                                    $config_file               = $sudo::params::config_file,
+  Boolean                                   $config_file_replace       = true,
+  String                                    $config_file_mode          = $sudo::params::config_file_mode,
+  String                                    $config_dir                = $sudo::params::config_dir,
+  String                                    $config_dir_mode           = $sudo::params::config_dir_mode,
+  Optional[Array[String]]                   $extra_include_dirs        = undef,
+  String                                    $content                   = $sudo::params::content,
+  Boolean                                   $ldap_enable               = false,
+  Boolean                                   $delete_on_error           = true,
+  Boolean                                   $validate_single           = false,
+  Boolean                                   $config_dir_keepme         = $sudo::params::config_dir_keepme,
+  Boolean                                   $use_sudoreplay            = false,
+  Optional[Array[String]]                   $sudoreplay_discard        = undef,
+  Hash                                      $configs                   = {},
 ) inherits sudo::params {
 
 
   case $enable {
     true: {
       $dir_ensure  = 'directory'
       $file_ensure = 'present'
     }
     false: {
       $dir_ensure  = 'absent'
       $file_ensure = 'absent'
     }
     default: { fail('no $enable is set') }
   }
 
   case $ldap_enable {
     true: {
       if $package_ldap == undef {
         fail('on your os ldap support for sudo is not yet supported')
       }
       $package_real = $package_ldap
     }
     false: {
       $package_real = $package
     }
     default: { fail('no $ldap_enable is set') }
   }
   if $package_real {
     class { 'sudo::package':
-      package            => $package_real,
-      package_ensure     => $package_ensure,
-      package_source     => $package_source,
-      package_admin_file => $package_admin_file,
-      ldap_enable        => $ldap_enable,
-      before             => [ File[$config_file], File[$config_dir] ],
+      package                   => $package_real,
+      package_ensure            => $package_ensure,
+      package_source            => $package_source,
+      package_provider_override => $package_provider_override,
+      package_admin_file        => $package_admin_file,
+      ldap_enable               => $ldap_enable,
+      before                    => [ File[$config_file], File[$config_dir] ],
     }
   }
 
   file { $config_file:
     ensure  => $file_ensure,
     owner   => 'root',
     group   => $sudo::params::config_file_group,
     mode    => $config_file_mode,
     replace => $config_file_replace,
     content => template($content),
   }
 
   file { $config_dir:
     ensure  => $dir_ensure,
     owner   => 'root',
     group   => $sudo::params::config_file_group,
     mode    => $config_dir_mode,
     recurse => $purge,
     purge   => $purge,
     ignore  => $purge_ignore,
   }
 
   if $config_dir_keepme {
     file { "${config_dir}/.keep-me":
       ensure => file,
       owner  => 'root',
       group  => $sudo::params::config_file_group,
     }
   }
 
   $configs.each |$config_name, $config| {
     sudo::conf { $config_name:
       * => $config,
     }
   }
 
   if $package_real {
     anchor { 'sudo::begin': }
     -> Class['sudo::package']
     -> anchor { 'sudo::end': }
   }
 }
diff --git a/manifests/package.pp b/manifests/package.pp
index 1c6e6c6..239250c 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -1,81 +1,86 @@
 # == Class: sudo::package
 #
 # Installs the sudo package on various platforms.
 #
 # === Parameters
 #
 # Document parameters here.
 #
 # [*package*]
 #   The name of the sudo package to be installed
 #
 # [*package_ensure*]
 #   Ensure if present or absent
 #
 # [*package_source*]
 #   Where to find the sudo packge, should be a local file or a uri
 #
+# [*package_provider_override*]
+#   Override the default package provider
+#
 # === Examples
 #
 #  class { sysdoc::package
 #    package => 'sudo',
 #  }
 #
 # === Authors
 #
 # Toni Schmidbauer <toni@stderr.at>
 #
 # === Copyright
 #
 # Copyright 2013 Toni Schmidbauer
 #
 class sudo::package(
   $package = '',
   $package_ensure = present,
   $package_source = '',
+  $package_provider_override = '',
   $package_admin_file = '',
   $ldap_enable = false,
 ) {
 
   if $ldap_enable == true {
     case $::osfamily {
       'Gentoo': {
         if defined( 'portage' ) {
           Class['sudo'] -> Class['portage']
           package_use { 'app-admin/sudo':
             ensure => present,
             use    => ['ldap'],
             target => 'sudo-flags',
           }
         } else {
           fail ('portage package needed to define ldap use on sudo')
         }
       }
       default: { }
     }
   }
 
   case $::osfamily {
     'AIX': {
       class { 'sudo::package::aix':
-        package        => $package,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
+        package                   => $package,
+        package_source            => $package_source,
+        package_ensure            => $package_ensure,
+        package_provider_override => $package_provider_override,
       }
     }
     'Darwin': {}
     'Solaris': {
       class { 'sudo::package::solaris':
         package            => $package,
         package_source     => $package_source,
         package_ensure     => $package_ensure,
         package_admin_file => $package_admin_file,
       }
     }
     default: {
       if $package != '' {
         ensure_packages([$package], {'ensure' => $package_ensure})
       }
     }
   }
 }
diff --git a/manifests/package/aix.pp b/manifests/package/aix.pp
index 89fb9dc..e0ad7ad 100644
--- a/manifests/package/aix.pp
+++ b/manifests/package/aix.pp
@@ -1,46 +1,49 @@
 # == Class: sudo::package::aix
 #
 # Install the perzl.org sudo package. It also requires the openldap
 # rpm. so we add a dependencies to the ldap module.
 #
 # === Parameters
 #
 # Document parameters here.
 #
 # [*package*]
 #   The name of the sudo package to be installed
 #
 # [*package_ensure*]
 #   Ensure if present or absent
 #
 # [*package_source*]
 #   Where to find the sudo packge, should be a local file or a uri
 #
+# [*package_provider_override*]
+#   Override the default package provider
+#
 # === Examples
 #
 #  class { sudo::package::aix:
 #    package => 'sudo',
 #    package_source 'http://myaixpkgserver/pkgs/aix/sudo-1.8.6p7-1.aix5.1.ppc.rpm'',
 #  }
 #
 # === Authors
 #
 # Toni Schmidbauer <toni@stderr.at>
 #
 # === Copyright
 #
 # Copyright 2013 Toni Schmidbauer
 #
 class sudo::package::aix (
   $package = '',
   $package_source = '',
   $package_ensure = 'present',
-
+  $package_provider_override = '',
   ) {
 
     package { $package:
       ensure   => $package_ensure,
       source   => $package_source,
-      provider => rpm,
+      provider => $package_provider_override,
     }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 4da13b8..23f325f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,226 +1,227 @@
 #class sudo::params
 #Set the paramters for the sudo module
 class sudo::params {
   $content_base     = "${module_name}/"
   $config_file_mode = '0440'
   $config_dir_mode  = '0550'
 
   case $::osfamily {
     'Debian': {
       case $::operatingsystem {
         'Ubuntu': {
           $content = "${content_base}sudoers.ubuntu.erb"
         }
         default: {
           if (versioncmp($::operatingsystemmajrelease, '7') >= 0) or
             ($::operatingsystemmajrelease =~ /\/sid/) or
             ($::operatingsystemmajrelease =~ /Kali/) {
             $content = "${content_base}sudoers.debian.erb"
           } else {
             $content = "${content_base}sudoers.olddebian.erb"
           }
         }
       }
       $package = 'sudo'
       $package_ldap = 'sudo-ldap'
       $package_ensure    = 'present'
       $package_source    = ''
       $package_admin_file = ''
       $config_file       = '/etc/sudoers'
       $config_dir        = '/etc/sudoers.d'
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'RedHat': {
       $package = 'sudo'
       # in redhat sudo package is already compiled for ldap support
       $package_ldap = $package
 
       # rhel 5.0 to 5.4 use sudo 1.6.9 which does not support
       # includedir, so we have to make sure sudo 1.7 (comes with rhel
       # 5.5) is installed.
       $package_ensure = $::operatingsystemrelease ? {
         /^5.[01234]$/ => 'latest',
         default      => 'present',
       }
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = $::operatingsystemrelease ? {
         /^5/    => "${content_base}sudoers.rhel5.erb",
         /^6/    => "${content_base}sudoers.rhel6.erb",
         /^7/    => "${content_base}sudoers.rhel7.erb",
         default => "${content_base}sudoers.rhel6.erb",
         }
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'Suse': {
       $package = 'sudo'
       $package_ldap = $package
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.suse.erb"
       $config_file_group = 'root'
       $config_dir_keepme = false
     }
     'Solaris': {
       case $::operatingsystem {
         'OmniOS': {
           $package = 'sudo'
           $package_ldap = undef
           $package_ensure = 'present'
           $package_source = ''
           $package_admin_file = ''
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.omnios.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         'SmartOS': {
           $package = 'sudo'
           $package_ldap = undef
           $package_ensure = 'present'
           $package_source = ''
           $package_admin_file = ''
           $config_file = '/opt/local/etc/sudoers'
           $config_dir = '/opt/local/etc/sudoers.d'
           $content = "${content_base}sudoers.smartos.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         default: {
           case $::kernelrelease {
             '5.11': {
               $package = 'pkg://solaris/security/sudo'
               $package_ldap = undef
               $package_ensure = 'present'
               $package_source = ''
               $package_admin_file = ''
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d'
               $content = "${content_base}sudoers.solaris.erb"
               $config_file_group = 'root'
               $config_dir_keepme = false
             }
             '5.10': {
               $package = 'TCMsudo'
               $package_ldap = undef
               $package_ensure = 'present'
               $package_source = "http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.9p5-${::hardwareisa}.pkg.gz"
               $package_admin_file = '/var/sadm/install/admin/puppet'
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d'
               $content = "${content_base}sudoers.solaris.erb"
               $config_file_group = 'root'
               $config_dir_keepme = false
             }
             default: {
               fail("Unsupported platform: ${::osfamily}/${::operatingsystem}/${::kernelrelease}")
             }
           }
         }
       }
     }
     'FreeBSD': {
       $package = 'security/sudo'
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/usr/local/etc/sudoers'
       $config_dir = '/usr/local/etc/sudoers.d'
       $content = "${content_base}sudoers.freebsd.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = true
     }
     'OpenBSD': {
       if (versioncmp($::kernelversion, '5.8') < 0) {
         $package = undef
       } else {
         $package = 'sudo'
       }
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.openbsd.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = false
     }
     'AIX': {
       $package = 'sudo'
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = 'http://www.sudo.ws/sudo/dist/packages/AIX/5.3/sudo-1.8.9-6.aix53.lam.rpm'
+      $package_provider_override = 'rpm'
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.aix.erb"
       $config_file_group = 'system'
       $config_dir_keepme = false
     }
     'Darwin': {
       $package = undef
       $package_ldap = undef
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d'
       $content = "${content_base}sudoers.darwin.erb"
       $config_file_group = 'wheel'
       $config_dir_keepme = false
     }
     default: {
       case $::operatingsystem {
         'Gentoo': {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.gentoo.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         'Archlinux': {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = "${content_base}sudoers.archlinux.erb"
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         'Amazon': {
           $package = 'sudo'
           $package_ldap = $package
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d'
           $content = $::operatingsystemrelease ? {
             /^5/    => "${content_base}sudoers.rhel5.erb",
             /^6/    => "${content_base}sudoers.rhel6.erb",
             default => "${content_base}sudoers.rhel6.erb",
           }
           $config_file_group = 'root'
           $config_dir_keepme = false
         }
         default: {
           fail("Unsupported platform: ${::osfamily}/${::operatingsystem}")
         }
       }
       $package_source = ''
       $package_admin_file = ''
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index 9284c04..9a89407 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,64 +1,64 @@
 {
   "name": "saz-sudo",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "author": "saz",
   "license": "Apache-2.0",
   "summary": "Manage sudo configuration via Puppet",
   "source": "https://github.com/saz/puppet-sudo",
   "project_page": "https://github.com/saz/puppet-sudo",
   "issues_url": "https://github.com/saz/puppet-sudo/issues",
   "tags": ["sudo"],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat"
     },
     {
       "operatingsystem": "CentOS"
     },
     {
       "operatingsystem": "OracleLinux"
     },
     {
       "operatingsystem": "Scientific"
     },
     {
       "operatingsystem": "Debian"
     },
     {
       "operatingsystem": "Ubuntu"
     },
     {
       "operatingsystem": "SmartOS"
     },
     {
       "operatingsystem": "OmniOS"
     },
     {
       "operatingsystem": "FreeBSD"
     },
     {
       "operatingsystem": "OpenBSD"
     },
     {
       "operatingsystem": "AIX"
     },
     {
       "operatingsystem": "Darwin"
     },
     {
       "operatingsystem": "Gentoo"
     },
     {
       "operatingsystem": "Archlinux"
     },
     {
       "operatingsystem": "Amazon"
     },
     {
       "operatingsystem": "Suse"
     }
   ],
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">=2.6.0 < 7.0.0" }
   ]
 }