diff --git a/.gitignore b/.gitignore
index 80da1cde..ac3eac03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-*.gem
-.zero-knife.rb
 *.rbc
-.bundle
 .config
 coverage
 InstalledFiles
@@ -12,7 +9,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-Gemfile.lock
 _Store
 *~
 *#
@@ -23,9 +19,14 @@ _Store
 *.tmp
 *.bk
 *.bkup
+
+# ruby/bundler files
 .ruby-version
 .ruby-gemset
 .rvmrc
+Gemfile.lock
+.bundle
+*.gem
 
 # YARD artifacts
 .yardoc
@@ -39,6 +40,7 @@ Berksfile.lock
 .kitchen.local.yml
 vendor/
 .coverage/
+.zero-knife.rb
 
 #vagrant stuff
 .vagrant/
diff --git a/chefignore b/chefignore
index 75d2251b..a9769175 100644
--- a/chefignore
+++ b/chefignore
@@ -1,5 +1,5 @@
 # Put files/directories that should be ignored in this file when uploading
-# or sharing to the community site.
+# to a chef-server or supermarket.
 # Lines that start with '# ' are comments.
 
 # OS generated files #
@@ -54,8 +54,13 @@ features/*
 examples/*
 Guardfile
 Procfile
-test/*
+.kitchen*
+.rubocop.yml
 spec/*
+Rakefile
+.travis.yml
+.foodcritic
+.codeclimate.yml
 
 # SCM #
 #######
@@ -79,8 +84,10 @@ tmp
 
 # Cookbooks #
 #############
-CONTRIBUTING
+CONTRIBUTING*
 CHANGELOG*
+TESTING*
+MAINTAINERS.toml
 
 # Strainer #
 ############
@@ -93,7 +100,3 @@ Strainerfile
 ###########
 .vagrant
 Vagrantfile
-
-# Travis #
-##########
-.travis.yml