diff --git a/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb b/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb
new file mode 100644
index 000000000..178881338
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb
@@ -0,0 +1,11 @@
+name    '<%= metadata.full_name %>'
+version '0.0.1'
+source '<%= metadata.source %>'
+author '<%= metadata.author %>'
+license '<%= metadata.license %>'
+summary '<%= metadata.summary %>'
+description '<%= metadata.description %>'
+project_page '<%= metadata.project_page %>'
+
+## Add dependencies, if any:
+# dependency 'username/name', '>= 1.2.0'
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/README.erb b/lib/puppet/module_tool/skeleton/templates/generator/README.erb
new file mode 100644
index 000000000..371c63f3c
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/README.erb
@@ -0,0 +1,3 @@
+<%= metadata.name %>
+
+This is the <%= metadata.name %> module.
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb b/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
new file mode 100644
index 000000000..a17c1a689
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
@@ -0,0 +1,17 @@
+# Class: <%= metadata.name %>
+#
+# This module manages <%= metadata.name %>
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+# [Remember: No empty lines between comments and class definition]
+class <%= metadata.name %> {
+
+
+}
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/metadata.json b/lib/puppet/module_tool/skeleton/templates/generator/metadata.json
new file mode 100644
index 000000000..8ce7797ff
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/metadata.json
@@ -0,0 +1,12 @@
+/*
++-----------------------------------------------------------------------+
+|                                                                       |
+|                    ==> DO NOT EDIT THIS FILE! <==                     |
+|                                                                       |
+|   You should edit the `Modulefile` and run `puppet-module build`      |
+|   to generate the `metadata.json` file for your releases.             |
+|                                                                       |
++-----------------------------------------------------------------------+
+*/
+
+{}
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/spec/spec.opts b/lib/puppet/module_tool/skeleton/templates/generator/spec/spec.opts
new file mode 100644
index 000000000..91cd6427e
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/spec/spec.opts
@@ -0,0 +1,6 @@
+--format
+s
+--colour
+--loadby
+mtime
+--backtrace
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb b/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
new file mode 100644
index 000000000..a4aeeae23
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
@@ -0,0 +1,18 @@
+require 'pathname'
+dir = Pathname.new(__FILE__).parent
+$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
+
+require 'mocha'
+require 'puppet'
+gem 'rspec', '=1.2.9'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+    config.mock_with :mocha
+end
+
+# We need this because the RAL uses 'should' as a method.  This
+# allows us the same behaviour but with a different method name.
+class Object
+    alias :must :should
+end
diff --git a/lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb b/lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
new file mode 100644
index 000000000..2efca54dc
--- /dev/null
+++ b/lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
@@ -0,0 +1 @@
+include <%= metadata.name %>