diff --git a/Gemfile b/Gemfile
index 64e64ff..4eec1a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,5 +26,6 @@ gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
 gem 'json', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
 gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
 gem 'metadata-json-lint'
+gem 'kafo_module_lint'
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index 450f294..0161413 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,7 @@ if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.8.7')
 end
 
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
+PuppetLint.configuration.log_format = '%{path}:%{line}:%{KIND}: %{message}'
 
 # Used for type alias tests
 PuppetSyntax.exclude_paths << 'spec/static_fixtures/test_module/**/*.pp' if Puppet.version.to_f < 4.0
@@ -27,4 +27,9 @@ PuppetLintParamDocs.define_selective do |config|
   config.pattern = []
 end
 
+require 'kafo_module_lint/tasks'
+KafoModuleLint::RakeTask.new do |config|
+  config.pattern = []
+end
+
 task :default => [:validate, :lint, :spec]