diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index 27670233a..000000000
--- a/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name         'puppetlabs-keystone'
-version      '4.0.0'
-author       'Puppet Labs and StackForge Contributors'
-license      'Apache License 2.0'
-summary      'Puppet module for OpenStack Keystone'
-description  'Installs and configures OpenStack Keystone (Identity).'
-project_page 'https://launchpad.net/puppet-keystone'
-source       'https://github.com/stackforge/puppet-keystone'
-
-dependency 'puppetlabs/apache', '>=1.0.0 <2.0.0'
-dependency 'puppetlabs/inifile', '>=1.0.0 <2.0.0'
-dependency 'puppetlabs/stdlib', '>= 3.2.0'
-dependency 'stackforge/openstacklib', '>=5.0.0'
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 000000000..368a28263
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,39 @@
+{
+  "name": "stackforge-keystone",
+  "version": "5.0.0",
+  "author": "Puppet Labs and StackForge Contributors",
+  "summary": "Puppet module for OpenStack Keystone",
+  "license": "Apache License 2.0",
+  "source": "git://github.com/stackforge/puppet-keystone.git",
+  "project_page": "https://launchpad.net/puppet-keystone",
+  "issues_url": "https://bugs.launchpad.net/puppet-keystone",
+  "requirements": [
+    { "name": "pe","version_requirement": "3.x" },
+    { "name": "puppet","version_requirement": "3.x" }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": ["7"]
+    },
+    {
+      "operatingsystem": "Fedora",
+      "operatingsystemrelease": ["20"]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": ["6.5","7"]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": ["12.04","14.04"]
+    }
+  ],
+  "description": "Installs and configures OpenStack Keystone (Identity).",
+  "dependencies": [
+    { "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
+    { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
+    { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
+    { "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0" }
+  ]
+}