diff --git a/manifests/config.pp b/manifests/config.pp
index 9452dad..cd1e860 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -2,10 +2,10 @@
 
   if $nullmailer::manage_etc_mailname == true {
 
-    file {"nullmailer /etc/mailname for ${::fqdn}":
+    file {"nullmailer /etc/mailname for $nullmailer::mailname":
       ensure  => present,
       name    => '/etc/mailname',
-      content => "${::fqdn}\n",
+      content => "$nullmailer::mailname\n",
     }
 
   }
@@ -18,6 +18,14 @@
     group   => 'mail',
     mode    => '0600',
   }
+  file { '/etc/nullmailer/me':
+    content => "$nullmailer::domain\n",
+    require => Class['nullmailer::package'],
+    notify  => Class['nullmailer::service'],
+    owner   => 'mail',
+    group   => 'mail',
+    mode    => '0600',
+  }
 
   if ($nullmailer::adminaddr == '') {
     file { '/etc/nullmailer/adminaddr':
diff --git a/manifests/init.pp b/manifests/init.pp
index 0372171..134efec 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,9 +3,11 @@
   $absentpackages = $nullmailer::params::absentpackages,
   $service = $nullmailer::params::service,
   $manage_etc_mailname = $nullmailer::params::manage_etc_mailname,
+  $mailname = $nullmailer::params::mailname,
   $adminaddr = "root@$::domain",
   $remoterelay = "smtp.$::domain",
-  $remoteopts = ''
+  $remoteopts = '',
+  $domain = $nullmailer::params::domain
 
 ) inherits nullmailer::params {
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 4cb2fb4..e4ffc0b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,6 +8,7 @@
                           'exim4-base', 'exim4-config', 'exim4']
       $service = 'nullmailer'
       $manage_etc_mailname = true
+      $mailname = "${::domain}"
     }
     default: {
       fail("Unsupported platform: ${::operatingsystem}")