diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dade81e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.bundled_gems/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..94a1a95
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+
+  gem 'metadata-json-lint'
+  # This is nice and all, but let's not worry about it until we've actually
+  # got puppet 4.x sorted
+  # gem 'puppet-lint-param-docs'
+  gem 'puppet-lint-absolute_classname-check'
+  gem 'puppet-lint-absolute_template_path'
+  gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  # Hold off on the empty string check for now
+  gem 'puppet-lint-empty_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
+  gem 'puppet-lint-spaceship_operator_without_tag-check'
+  gem 'puppet-lint-undef_in_function-check'
+
+  if puppetversion = ENV['PUPPET_GEM_VERSION']
+    gem 'puppet', puppetversion, :require => false
+  else
+    gem 'puppet', '~> 3.0', :require => false
+  end
+
+end
+
+# vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index ff1f0d7..66c2b73 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,3 +6,4 @@ PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_autoloader_layout')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetLint.configuration.send('disable_arrow_alignment')
diff --git a/manifests/init.pp b/manifests/init.pp
index f0ed89f..6dcb9c6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,7 +31,7 @@ class bandersnatch {
     ensure => directory,
   }
 
-  include logrotate
+  include ::logrotate
   logrotate::file { 'bandersnatch':
     log     => '/var/log/bandersnatch/mirror.log',
     options => [
diff --git a/manifests/mirror.pp b/manifests/mirror.pp
index 4ca09a9..a3d2fd6 100644
--- a/manifests/mirror.pp
+++ b/manifests/mirror.pp
@@ -42,7 +42,7 @@ class bandersnatch::mirror (
     require => File[$mirror_root],
   }
 
-  include apache
+  include ::apache
 
   apache::vhost { $vhost_name:
     port     => 80,
@@ -70,4 +70,4 @@ class bandersnatch::mirror (
     command     => 'flock -n /var/run/bandersnatch/mirror.lock timeout -k 2m 30m run-bandersnatch >>/var/log/bandersnatch/mirror.log 2>&1',
     environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }
-}
\ No newline at end of file
+}