diff --git a/manifests/master.pp b/manifests/master.pp
index 6c14981..3a360b1 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -1,117 +1,122 @@
 # munin::master - Define a munin master
 #
 # The munin master will install munin, and collect all exported munin
 # node definitions as files into /etc/munin/munin-conf.d/.
 #
 # Parameters:
 #
 # - node_definitions: A hash of node definitions used by
 #   create_resources to make static node definitions.
 #
+# - host_name: A host name for this munin master, matched with
+#   munin::node::mastername for collecting nodes. Defaults to $::fqdn
+#
 # - graph_strategy: 'cgi' (default) or 'cron'
 #   Controls if munin-graph graphs all services ('cron') or if graphing is done
 #   by munin-cgi-graph (which must configured seperatly)
 #
 # - html_strategy: 'cgi' (default) or 'cron'
 #   Controls if munin-html will recreate all html pages every run interval
 #   ('cron') or if html pages are generated by munin-cgi-graph (which must
 #   configured seperatly)
 #
 # - config_root: the root directory of the munin master configuration.
 #   Default: /etc/munin on most platforms.
 #
 # - collect_nodes: 'enabled' or 'disabled' default 'enabled'.
 #   Makes puppetmaster collect exported node_definitions.
 #
 # - dbdir: Path to the munin dbdir, where munin stores everything
 #
 # - htmldir: Path to where munin will generate HTML documents and
 #   graphs, used if graph_strategy is cron.
 #
 # - rundir: Path to directory munin uses for pid and lock files.
 #
 # - tls: 'enabled' or 'disabled' (default). Controls the use of TLS
 #   globally for master to node communications.
 #
 # - tls_certificate: Path to a file containing a TLS certificate. No
 #   default. Required if tls is enabled.
 #
 # - tls_private_key: Path to a file containing a TLS key. No default.
 #   Required if tls is enabled.
 #
 # - tls_verify_certificate: 'yes' (default) or 'no'.
 #
 # - extra_config: Extra lines of config to put in munin.conf.
 
 class munin::master (
   $node_definitions       = $munin::params::master::node_defintions,
   $graph_strategy         = $munin::params::master::graph_strategy,
   $html_strategy          = $munin::params::master::html_strategy,
   $config_root            = $munin::params::master::config_root,
   $collect_nodes          = $munin::params::master::collect_nodes,
   $dbdir                  = $munin::params::master::dbdir,
   $htmldir                = $munin::params::master::htmldir,
   $logdir                 = $munin::params::master::logdir,
   $rundir                 = $munin::params::master::rundir,
   $tls                    = $munin::params::master::tls,
   $tls_certificate        = $munin::params::master::tls_certificate,
   $tls_private_key        = $munin::params::master::tls_private_key,
   $tls_verify_certificate = $munin::params::master::tls_verify_certificate,
+  $host_name              = $munin::params::master::host_name,
   $extra_config           = $munin::params::master::extra_config,
   ) inherits munin::params::master {
 
   if $node_definitions {
     validate_hash($node_definitions)
   }
   if $graph_strategy {
     validate_re($graph_strategy, [ '^cgi$', '^cron$' ])
   }
   if $html_strategy {
     validate_re($html_strategy, [ '^cgi$', '^cron$' ])
   }
-  validate_re($collect_nodes,  [ '^enabled$', '^disabled$' ])
+  validate_re($collect_nodes, [ '^enabled$', '^disabled$', '^mine$',
+                                '^unclaimed$' ])
   validate_absolute_path($config_root)
 
   validate_re($tls, [ '^enabled$', '^disabled$' ])
 
   if $tls == 'enabled' {
     validate_re($tls_verify_certificate, [ '^yes$', '^no$' ])
     validate_absolute_path($tls_private_key)
     validate_absolute_path($tls_certificate)
   }
 
   validate_array($extra_config)
 
   # The munin package and configuration
   package { 'munin':
     ensure => latest,
   }
 
   File {
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
     require => Package['munin'],
   }
 
   file { "${config_root}/munin.conf":
     content => template('munin/munin.conf.erb'),
   }
 
   file { "${config_root}/munin-conf.d":
     ensure  => directory,
     recurse => true,
     purge   => true,
     force   => true,
   }
 
   if $collect_nodes == 'enabled' {
     # Collect all exported node definitions
     Munin::Master::Node_definition <<| mastername == $::fqdn or mastername == '' |>>
   }
 
   # Create static node definitions
   if $node_definitions {
     create_resources(munin::master::node_definition, $node_definitions, {})
   }
 }
diff --git a/manifests/params/master.pp b/manifests/params/master.pp
index 862e224..30b4c9e 100644
--- a/manifests/params/master.pp
+++ b/manifests/params/master.pp
@@ -1,30 +1,31 @@
 class munin::params::master {
   $message = "Unsupported osfamily ${::osfamily}"
 
   $graph_strategy           = 'cgi'
   $html_strategy            = 'cgi'
   $node_definitions         = ''
   $collect_nodes            = 'enabled'
   $dbdir                    = undef
   $htmldir                  = undef
   $logdir                   = undef
   $rundir                   = undef
   $tls                      = 'disabled'
   $tls_certificate          = undef
   $tls_private_key          = undef
   $tls_verify_certificate   = 'yes'
   $extra_config             = []
+  $host_name                = $::fqdn
 
   case $::osfamily {
     'Debian',
     'RedHat': {
       $config_root = '/etc/munin'
     }
     'Solaris': {
       $config_root = '/opt/local/etc/munin'
     }
     default: {
       fail($message)
     }
   }
 }
diff --git a/spec/classes/munin_master_spec.rb b/spec/classes/munin_master_spec.rb
index b477416..b42bf2b 100644
--- a/spec/classes/munin_master_spec.rb
+++ b/spec/classes/munin_master_spec.rb
@@ -1,133 +1,149 @@
 require 'spec_helper'
 
 describe 'munin::master' do
 
   [ :CentOS, :Debian, :RedHat, :Ubuntu ].each do |sc|
     context "Check for supported operatingsystem #{sc}" do
       include_context sc
       it { should compile }
       it { should contain_class('munin::master') }
       it {
         should contain_package('munin')
         should contain_file('/etc/munin/munin.conf')
         should contain_file('/etc/munin/munin-conf.d')
           .with_ensure('directory')
       }
     end
   end
 
   [ :SmartOS ].each do |sc|
     context "Check for supported operatingsystem #{sc}" do
       include_context sc
       it { should compile }
       it { should contain_class('munin::master') }
       it {
         should contain_package('munin')
         should contain_file('/opt/local/etc/munin/munin.conf')
         should contain_file('/opt/local/etc/munin/munin-conf.d')
           .with_ensure('directory')
       }
     end
   end
 
   context 'with default params' do
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/graph_strategy\s+cgi/)
         .with_content(/html_strategy\s+cgi/)
     }
   end
 
   context 'with html_strategy => cron' do
     let (:params) { { :html_strategy => 'cron' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/html_strategy\s+cron/)
     }
   end
 
   context 'with graph_strategy => cron' do
     let (:params) { { :graph_strategy => 'cron' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/graph_strategy\s+cron/)
     }
   end
 
   context 'with dbdir => /var/lib/munin' do
     let (:params) { { :dbdir => '/var/lib/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/lib\/munin/)
     }
   end
 
   context 'with htmldir => /var/www/munin' do
     let (:params) { { :htmldir => '/var/www/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/htmldir\s+\/var\/www\/munin/)
     }
   end
 
   context 'with logdir => /var/log/munin' do
     let (:params) { { :dbdir => '/var/log/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/log\/munin/)
     }
   end
 
   context 'with rudir => /var/run/munin' do
     let (:params) { { :dbdir => '/var/run/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/run\/munin/)
     }
   end
 
   context 'with tls => enabled' do
     let(:params) {
       {
         :tls => 'enabled',
         :tls_certificate => '/path/to/certificate.pem',
         :tls_private_key => '/path/to/key.pem',
         :tls_verify_certificate => 'yes',
       }
     }
 
     it { should compile }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/tls = enabled/)
         .with_content(/tls_certificate = \/path\/to\/certificate\.pem/)
         .with_content(/tls_private_key = \/path\/to\/key\.pem/)
         .with_content(/tls_verify_certificate = yes/)
     }
   end
 
   context 'with extra_config' do
     token = '1b7febce-bb2d-4c18-b889-84c73538a900'
     let(:params) do
       { :extra_config => [ token ] }
     end
     it { should compile }
     it do
       should contain_file('/etc/munin/munin.conf')
               .with_content(/#{token}/)
     end
   end
 
   context 'with extra_config set to a string' do
     token = '1b7febce-bb2d-4c18-b889-84c73538a900'
     let(:params) do
       { :extra_config => token }
     end
     it do
       expect { should compile }
         .to raise_error(Puppet::Error, /is not an Array/)
     end
 
   end
 
+  ['test.example.com', 'invalid/hostname.example.com'].each do |param|
+    context "with host_name => #{param}" do
+      let(:params) do
+        { :host_name => param }
+      end
+      if param =~ /invalid/
+        it do
+          expect { should compile }
+            .to raise_error(Puppet::Error, /valid domain name/)
+        end
+      else
+        it { should compile }
+      end
+    end
+  end
+
 end