diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3bfbcd..117af02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 2016-08-08 0.1.8
+* only run control-setup if control is enabled
+
 ### 2016-08-08 0.1.7
 * fix slave_addresses variable scope for future parser
 
diff --git a/manifests/init.pp b/manifests/init.pp
index be5d0c0..b838361 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -144,11 +144,13 @@
     content => template($server_template),
     order   => '01',
   }
-  exec { 'nsd-control-setup':
-    command => 'nsd-control-setup',
-    path    => '/usr/bin:/usr/sbin:/usr/local/sbin',
-    creates => $server_key_file,
-    require => Package[$package_name],
+  if $control_enable {
+    exec { 'nsd-control-setup':
+      command => 'nsd-control-setup',
+      path    => '/usr/bin:/usr/sbin:/usr/local/sbin',
+      creates => $server_key_file,
+      require => Package[$package_name],
+    }
   }
   file { [$zonesdir, $zone_subdir]:
     ensure  => directory,
diff --git a/metadata.json b/metadata.json
index a0f6827..2c5d7f7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "icann-nsd",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "author": "john.bond@icann.org",
   "summary": "puppet module to manage NSD",
   "license": "Apache-2.0",