diff --git a/.travis.yml b/.travis.yml
index 51df66cb..a4545ddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec metadata-json-lint metadata.json && bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 rvm:
   - 1.9.3
   - 2.0.0
@@ -12,4 +12,6 @@ matrix:
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 3.1.0"
   - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
\ No newline at end of file
+    env: PUPPET_VERSION="~> 2.7.0"
+
+sudo: false
diff --git a/Gemfile b/Gemfile
index f2f1b41c..f6ca52f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
+  gem 'metadata-json-lint',      :require => false
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index 67bf85c0..00000000
--- a/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name          'stankevich-python'
-version       '1.9.4'
-source        'git://github.com/stankevich/puppet-python.git'
-author        'stankevich'
-license       'Apache License, Version 2.0'
-summary       'Python Module'
-description   'Puppet module for Python'
-project_page  'https://github.com/stankevich/puppet-python'
-
-## Add dependencies, if any:
-dependency    'puppetlabs/stdlib', '>= 4.0.0'
-dependency    'stahnma/epel', '>= 1.0.1'
diff --git a/metadata.json b/metadata.json
index ad4c337f..74838909 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,14 +1,19 @@
 {
   "name": "stankevich-python",
   "version": "1.9.4",
-  "source": "git://github.com/stankevich/puppet-python.git",
   "author": "stankevich",
-  "license": "Apache Version 2.0",
   "summary": "Python Module",
-  "description": "Puppet module for Python",
+  "license": "Apache-2.0",
+  "source": "git://github.com/stankevich/puppet-python.git",
   "project_page": "https://github.com/stankevich/puppet-python",
   "issues_url": "https://github.com/stankevich/puppet-python/issues",
-  "tags": ["python", "pip", "virtualenv", "gunicorn"],
+  "description": "Puppet module for Python",
+  "tags": [
+    "python",
+    "pip",
+    "virtualenv",
+    "gunicorn"
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "CentOS",
@@ -43,17 +48,11 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">=3.0.0 < 4.0.0"
     }
   ],
   "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.0.0"
-    },
-    {
-      "name": "stahnma/epel",
-      "version_requirement": ">= 1.0.1"
-    }
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.0.0 < 6.0.0"},
+    {"name":"stahnma/epel","version_requirement":">= 1.0.1 < 2.0.0"}
   ]
 }