diff --git a/.fixtures.yml b/.fixtures.yml
index f65dff1..2e11f1b 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,26 +1,26 @@
 fixtures:
   repositories:
     firewall:
-      repo: 'git://github.com/puppetlabs/puppetlabs-firewall.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
       ref: '0.2.1'
     stdlib:
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
       ref: '4.6.0'
     mysql:
-      repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-mysql.git'
       ref: '2.0.1-rc1'
     passenger:
-      repo: 'git://github.com/puppetlabs/puppetlabs-passenger.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-passenger.git'
       ref: '0.0.4'
     apache:
-      repo: 'git://github.com/puppetlabs/puppetlabs-apache.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-apache.git'
       ref: '0.5.0-rc1'
     concat:
-      repo: 'git://github.com/puppetlabs/puppetlabs-concat.git'
+      repo: 'https://github.com/puppetlabs/puppetlabs-concat.git'
       ref: '1.0.0'
     common:
-      repo: 'git://github.com/ghoneycutt/puppet-module-common.git'
+      repo: 'https://github.com/ghoneycutt/puppet-module-common.git'
     htpasswd:
-      repo: 'git://github.com/leinaddm/puppet-htpasswd.git'
+      repo: 'https://github.com/leinaddm/puppet-htpasswd.git'
   symlinks:
     puppet: "#{source_dir}"
diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index 8055a88..0000000
--- a/Modulefile
+++ /dev/null
@@ -1,17 +0,0 @@
-name    'ghoneycutt-puppet'
-version '2.15.0'
-source 'git://github.com/ghoneycutt/puppet-module-puppet.git'
-author 'ghoneycutt'
-license 'Apache-2.0'
-summary 'Manage Puppet'
-description 'Manages Puppet, including Master, Agent, Dashboard and maintenance tasks.'
-project_page 'https://github.com/ghoneycutt/puppet-module-puppet'
-
-dependency 'ghoneycutt/common', '>= 1.0.3'
-dependency 'leinaddm/htpasswd', '>= 0.0.1'
-dependency 'puppetlabs/stdlib', '>= 4.6.0'
-dependency 'puppetlabs/mysql', '>= 2.0.0'
-dependency 'puppetlabs/passenger', '>= 0.0.4'
-dependency 'puppetlabs/apache', '>= 0.5.0'
-dependency 'puppetlabs/firewall', '>= 0.2.1'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/metadata.json b/metadata.json
index 1f1f494..4a9ab76 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,6 +3,7 @@
   "version": "2.16.0",
   "author": "ghoneycutt",
   "summary": "Manage Puppet",
+  "description": "Manages Puppet, including Master, Agent, Dashboard and maintenance tasks.",
   "license": "Apache-2.0",
   "source": "git://github.com/ghoneycutt/puppet-module-puppet.git",
   "project_page": "https://github.com/ghoneycutt/puppet-module-puppet",
@@ -10,11 +11,11 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.2.x"
+      "version_requirement": ">= 3.2.0 < 5.0.0"
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -78,15 +79,14 @@
       ]
     }
   ],
-  "description": "Manages Puppet, including Master, Agent, Dashboard and maintenance tasks.",
   "dependencies": [
-    {"name":"ghoneycutt/common","version_requirement":">= 1.0.3"},
-    {"name":"leinaddm/htpasswd","version_requirement":">= 0.0.1"},
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0"},
-    {"name":"puppetlabs/mysql","version_requirement":">= 2.0.0"},
-    {"name":"puppetlabs/passenger","version_requirement":">= 0.0.4"},
-    {"name":"puppetlabs/apache","version_requirement":">= 0.5.0"},
-    {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.0.0"}
+    {"name":"ghoneycutt/common","version_requirement":">= 1.0.3 < 2.0.0"},
+    {"name":"leinaddm/htpasswd","version_requirement":">= 0.0.1 < 2.0.0"},
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
+    {"name":"puppetlabs/mysql","version_requirement":">= 2.0.0 < 3.0.0"},
+    {"name":"puppetlabs/passenger","version_requirement":">= 0.0.4 < 2.0.0"},
+    {"name":"puppetlabs/apache","version_requirement":">= 0.5.0 < 2.0.0"},
+    {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"},
+    {"name":"puppetlabs/concat","version_requirement":">= 1.0.0 < 2.0.0"}
   ]
 }