diff --git a/Gemfile b/Gemfile
index 99014ac16..8cf56f91b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ group :rake do
   gem 'puppet-lint',            '~> 2.0', :require => false
   gem 'puppet-blacksmith',                :require => false
   gem 'rake',                             :require => false
+  gem 'metadata-json-lint',               :require => false
 end
 
 group :system_tests do
diff --git a/metadata.json b/metadata.json
index 694168d06..8cfcde953 100644
--- a/metadata.json
+++ b/metadata.json
@@ -19,7 +19,7 @@
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -48,6 +48,9 @@
     {
       "operatingsystem": "Solaris"
     },
+    { "operatingsystem": "AIX" },
+    { "operatingsystem": "FreeBSD" },
+    { "operatingsystem": "NetBSD" },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [