diff --git a/.gitignore b/.gitignore
index a01ee28..3366d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .*.swp
+/pkg
diff --git a/Modulefile b/Modulefile
new file mode 100644
index 0000000..79a4fa9
--- /dev/null
+++ b/Modulefile
@@ -0,0 +1,19 @@
+name    'stesie-gluon'
+version '0.1.0'
+source 'https://github.com/ffansbach/gluon-puppet'
+author 'stesie'
+license 'Apache License, Version 2.0'
+summary 'puppet module to ease setup of gluon gateway server'
+description 'A puppet module to set up everything needed for a Freifunk Mesh Gateway, using Gluon firmware.'
+project_page 'https://github.com/ffansbach/'
+
+dependency 'puppetlabs/apache', '>= 1.1.1'
+dependency 'puppetlabs/apt', '>= 1.6.0'
+dependency 'puppetlabs/concat', '>= 1.1.1'
+dependency 'puppetlabs/firewall', '>= 1.1.3'
+dependency 'camptocamp/kmod', '>= 0.1.3'
+dependency 'puppetlabs/mysql', '>= 2.3.1'
+dependency 'example42/network', '>= 3.1.14'
+dependency 'puppetlabs/stdlib', '>= 4.3.2'
+dependency 'thias/sysctl', '>= 1.0.0'
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..5fda588
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,17 @@
+dir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.join(dir, 'lib')
+
+require 'mocha'
+require 'puppet'
+require 'rspec'
+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/tests/init.pp b/tests/init.pp
new file mode 100644
index 0000000..0f53af0
--- /dev/null
+++ b/tests/init.pp
@@ -0,0 +1,12 @@
+# The baseline for module testing used by Puppet Labs is that each manifest
+# should have a corresponding test manifest that declares that class or defined
+# type.
+#
+# Tests are then run by using puppet apply --noop (to check for compilation
+# errors and view a log of events) or by fully applying the test in a virtual
+# environment (to compare the resulting system state to the desired state).
+#
+# Learn more about module testing here:
+# http://docs.puppetlabs.com/guides/tests_smoke.html
+#
+include gluon