diff --git a/manifests/init.pp b/manifests/init.pp
index 0d4824be..ec9999b2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,12 +16,13 @@
 #  }
 #
 class bind (
-  $chroot            = false,
-  $service_reload    = true,
-  $servicename       = $::bind::params::servicename,
-  $packagenameprefix = $::bind::params::packagenameprefix,
-  $binduser          = $::bind::params::binduser,
-  $bindgroup         = $::bind::params::bindgroup,
+  $chroot               = false,
+  $service_reload       = true,
+  $servicename          = $::bind::params::servicename,
+  $packagenameprefix    = $::bind::params::packagenameprefix,
+  $binduser             = $::bind::params::binduser,
+  $bindgroup            = $::bind::params::bindgroup,
+  $named_checkzone_path = '/usr/sbin/named-checkzone',
 ) inherits ::bind::params {
 
   # Chroot differences
diff --git a/manifests/server.pp b/manifests/server.pp
index 3c1b5a1e..74b44322 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -3,13 +3,11 @@
 # For backwards compatibility. Use the main bind class instead.
 #
 class bind::server (
-  $chroot            = false,
-  $packagenameprefix = $::bind::params::packagenameprefix,
+  $chroot               = false,
+  $packagenameprefix    = $::bind::params::packagenameprefix,
 ) inherits ::bind::params {
-
-  class { '::bind':
+  class { 'bind':
     chroot            => $chroot,
     packagenameprefix => $packagenameprefix,
   }
-
 }
diff --git a/manifests/server/file.pp b/manifests/server/file.pp
index f58bb3d4..601eeea7 100644
--- a/manifests/server/file.pp
+++ b/manifests/server/file.pp
@@ -78,7 +78,7 @@
     source       => $zone_source,
     content      => $content,
     replace      => $replace,
-    validate_cmd => "/usr/sbin/named-checkzone -k fail -m fail -M fail -n fail -r fail -S fail -T warn -W warn ${zonename} %",
+    validate_cmd => "${bind::named_checkzone_path} -k fail -m fail -M fail -n fail -r fail -S fail -T warn -W warn ${zonename} %",
     notify       => Class['::bind::service'],
     # For the parent directory
     require      => [