diff --git a/Gemfile b/Gemfile
index c25f31b13..353da1d1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake', '>= 10.1.1'
 gem 'rspec', '~> 2.99.0'
-gem 'puppet-lint', '>= 0.3.2'
+gem 'puppet-lint', '>= 0.3.2', '< 1.0.0'
 gem 'rspec-puppet', '>= 1.0.1'
 gem 'puppetlabs_spec_helper', '>= 0.4.1'
 gem 'puppet-syntax', '>= 1.1.0'
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index fd0dd8683..1e5474645 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -70,10 +70,10 @@
     }
 
     exec { "download-${name}" :
-      command    => "rm -rf ${name} ${name}.* && wget --no-check-certificate ${base_url}${plugin}",
-      cwd        => $plugin_dir,
-      require    => [File[$plugin_dir], Package['wget']],
-      path       => ['/usr/bin', '/usr/sbin', '/bin'],
+      command => "rm -rf ${name} ${name}.* && wget --no-check-certificate ${base_url}${plugin}",
+      cwd     => $plugin_dir,
+      require => [File[$plugin_dir], Package['wget']],
+      path    => ['/usr/bin', '/usr/sbin', '/bin'],
     }
 
     file { "${plugin_dir}/${plugin}" :
diff --git a/manifests/slave.pp b/manifests/slave.pp
index ca18373e4..c581f2c83 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -118,11 +118,11 @@
   }
 
   exec { 'get_swarm_client':
-    command      => "wget -O ${slave_home}/${client_jar} ${client_url}/${client_jar}",
-    path         => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
-    user         => $slave_user,
+    command => "wget -O ${slave_home}/${client_jar} ${client_url}/${client_jar}",
+    path    => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',
+    user    => $slave_user,
     #refreshonly => true,
-    creates      => "${slave_home}/${client_jar}",
+    creates => "${slave_home}/${client_jar}",
     ## needs to be fixed if you create another version..
   }
 
diff --git a/manifests/sysconfig.pp b/manifests/sysconfig.pp
index a99665f01..3c85c56c2 100644
--- a/manifests/sysconfig.pp
+++ b/manifests/sysconfig.pp
@@ -10,10 +10,10 @@
   }
 
   file_line { "Jenkins sysconfig setting ${name}":
-    path    => "${path}/jenkins",
-    line    => "${name}=\"${value}\"",
-    match   => "^${name}=",
-    notify  => Service['jenkins'],
+    path   => "${path}/jenkins",
+    line   => "${name}=\"${value}\"",
+    match  => "^${name}=",
+    notify => Service['jenkins'],
   }
 
 }