diff --git a/manifests/init.pp b/manifests/init.pp
index c7ab120..32ac633 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,6 +5,8 @@ class bind (
 	$dnssec     = true,
 ) inherits bind::params {
 
+	include concat::setup
+
 	$auth_nxdomain = false
 
 	package { $bind::params::bind_package:
@@ -35,13 +37,15 @@ class bind (
 		mode    => '0644',
 		content => template('bind/named.conf.erb'),
 		notify  => Service[$bind::params::bind_service],
+		require => Package[$bind::params::bind_package],
 	}
 
 	file { [ "${confdir}/zones", "${confdir}/keys" ]:
-		ensure => directory,
-		owner  => 'root',
-		group  => $bind::params::bind_group,
-		mode   => '0755',
+		ensure  => directory,
+		owner   => 'root',
+		group   => $bind::params::bind_group,
+		mode    => '0755',
+		require => Package[$bind::params::bind_package],
 	}
 
 	concat { [
@@ -49,10 +53,11 @@ class bind (
 		"${confdir}/keys.conf",
 		"${confdir}/views.conf",
 		]:
-		owner  => 'root',
-		group  => $bind::params::bind_group,
-		mode   => '0644',
-		notify => Service[$bind::params::bind_service],
+		owner   => 'root',
+		group   => $bind::params::bind_group,
+		mode    => '0644',
+		notify  => Service[$bind::params::bind_service],
+		require => Package[$bind::params::bind_package],
 	}
 
 	concat::fragment { "named-acls-header":
diff --git a/manifests/key.pp b/manifests/key.pp
index 9b9b0cd..7f919f5 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -11,6 +11,7 @@ define bind::key (
 		mode    => '0640',
 		content => template('bind/key.conf.erb'),
 		notify  => Service[$bind::params::bind_service],
+		require => Package[$bind::params::bind_package],
 	}
 	concat::fragment { "bind-key-${name}":
 		order   => '10',
diff --git a/manifests/zone.pp b/manifests/zone.pp
index 15c698e..657f4df 100644
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -24,6 +24,7 @@ define bind::zone (
 				mode    => '0644',
 				replace => false,
 				source  => 'puppet:///modules/bind/db.empty',
+				require => Package[$bind::params::bind_package],
 			}
 		}
 	}
@@ -35,6 +36,7 @@ define bind::zone (
 		mode    => '0644',
 		content => template('bind/zone.conf.erb'),
 		notify  => Service[$bind::params::bind_service],
+		require => Package[$bind::params::bind_package],
 	}
 
 }
diff --git a/templates/key.conf.erb b/templates/key.conf.erb
index e383acf..117ba82 100644
--- a/templates/key.conf.erb
+++ b/templates/key.conf.erb
@@ -1,5 +1,5 @@
 
 key <%= name %> {
 	algorithm <%= algorithm %>;
-	secret <%= secret %>;
+	secret "<%= secret %>";
 };