diff --git a/manifests/init.pp b/manifests/init.pp
index 275d762..9ca1b98 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,64 +1,80 @@
 # == Class: postfix
 #
 # Manage postfix configuration with Debian preseeding
 #
 # === Parameters
 #
 # [*relayhost*]
 #    Set the relayhost for the machine
 #
-# [*main_mailer_type*]
-#    Set the main mailer type as would be asked through debconf.
-#    Values: 'No configuration', 'Internet Site', 'Internet with smarthost', 'Satellite system', 'Local only'
-#    Default: 'Satellite system'
-#
 # [*root_address*]
 #    Set the forward address for mail sent to root.
 #    Default: '' (keeping the current root alias)
 #
 # [*mailname*]
 #    The default domain for outgoing mail
 #    Default: $::fqdn
 #
 # [*destinations*]
 #    Array of domains for whose the mail is locally delivered
 #    Default: [$::fqdn]
 #
 # [*mynetworks*]
 #    Array of networks from which to accept mail
 #    Default: ['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128'] (only accept local mail)
 # === Examples
 #
 #  class { 'postfix':
 #    relayhost => '[smtp.example.com]',
 #  }
 #
 # === Authors
 #
 # Nicolas Dandrimont <nicolas@dandrimont.eu>
 #
 # === Copyright
 #
 # Copyright 2015 Nicolas Dandrimont
 #
 class postfix (
   $relayhost        = undef,
-  $main_mailer_type = 'Satellite system',
   $root_address     = '',
   $mailname         = $::fqdn,
   $destinations     = [$::fqdn],
   $mynetworks       = ['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128'],
 ){
 
   validate_string($relayhost)
   validate_string($main_mailer_type)
   validate_string($root_address)
   validate_string($mailname)
   assert_type(Array[String], $destinations)
   assert_type(Array[String], $mynetworks)
 
-  debconf_package {'postfix':
+  package {'postfix':
+    ensure  => present,
+  }
+
+  service {'postfix':
+    ensure => running,
+    enable => true,
+    require => [
+      File['/etc/postfix/main.cf'],
+      File['/etc/postfix/master.cf'],
+    ],
+  }
+
+  file {'/etc/postfix/main.cf':
+    ensure  => present,
+    content => template('postfix/main.cf.erb'),
+    notify  => Service['postfix'],
+    require => Package['postfix'],
+  }
+
+  file {'/etc/postfix/master.cf':
     ensure  => present,
-    content => template('postfix/preseed.erb'),
+    content => template('postfix/master.cf.erb'),
+    notify  => Service['postfix'],
+    require => Package['postfix'],
   }
 }
diff --git a/templates/main.cf.erb b/templates/main.cf.erb
new file mode 100644
index 0000000..807ce1a
--- /dev/null
+++ b/templates/main.cf.erb
@@ -0,0 +1,38 @@
+# Postfix main configuration file
+#
+# Managed by puppet - module swh-puppet
+#
+# Changes will be overwritten!
+
+smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
+biff = no
+
+# appending .domain is the MUA's job.
+append_dot_mydomain = no
+
+# Uncomment the next line to generate "delayed mail" warnings
+#delay_warning_time = 4h
+
+readme_directory = no
+
+# TLS parameters
+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
+smtpd_use_tls=yes
+smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
+
+# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
+# information on enabling SSL in the smtp client.
+
+smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
+myhostname = <%= @mailname %>
+alias_maps = hash:/etc/aliases
+alias_database = hash:/etc/aliases
+myorigin = <%= @mailname %>
+mydestination = <%= @destinations.join(", ") %>
+relayhost = <%= @relayhost %>
+mynetworks = <%= @mynetworks.join(" ") %>
+mailbox_size_limit = 0
+recipient_delimiter = +
+inet_interfaces = all
diff --git a/templates/master.cf.erb b/templates/master.cf.erb
new file mode 100644
index 0000000..04cd2cf
--- /dev/null
+++ b/templates/master.cf.erb
@@ -0,0 +1,124 @@
+#
+# Postfix master process configuration file.  For details on the format
+# of the file, see the master(5) manual page (command: "man 5 master" or
+# on-line: http://www.postfix.org/master.5.html).
+#
+# Do not forget to execute "postfix reload" after editing this file.
+#
+# ==========================================================================
+# service type  private unpriv  chroot  wakeup  maxproc command + args
+#               (yes)   (yes)   (yes)   (never) (100)
+# ==========================================================================
+smtp      inet  n       -       -       -       -       smtpd
+#smtp      inet  n       -       -       -       1       postscreen
+#smtpd     pass  -       -       -       -       -       smtpd
+#dnsblog   unix  -       -       -       -       0       dnsblog
+#tlsproxy  unix  -       -       -       -       0       tlsproxy
+#submission inet n       -       -       -       -       smtpd
+#  -o syslog_name=postfix/submission
+#  -o smtpd_tls_security_level=encrypt
+#  -o smtpd_sasl_auth_enable=yes
+#  -o smtpd_reject_unlisted_recipient=no
+#  -o smtpd_client_restrictions=$mua_client_restrictions
+#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+#  -o smtpd_recipient_restrictions=
+#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+#  -o milter_macro_daemon_name=ORIGINATING
+#smtps     inet  n       -       -       -       -       smtpd
+#  -o syslog_name=postfix/smtps
+#  -o smtpd_tls_wrappermode=yes
+#  -o smtpd_sasl_auth_enable=yes
+#  -o smtpd_reject_unlisted_recipient=no
+#  -o smtpd_client_restrictions=$mua_client_restrictions
+#  -o smtpd_helo_restrictions=$mua_helo_restrictions
+#  -o smtpd_sender_restrictions=$mua_sender_restrictions
+#  -o smtpd_recipient_restrictions=
+#  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
+#  -o milter_macro_daemon_name=ORIGINATING
+#628       inet  n       -       -       -       -       qmqpd
+pickup    unix  n       -       -       60      1       pickup
+cleanup   unix  n       -       -       -       0       cleanup
+qmgr      unix  n       -       n       300     1       qmgr
+#qmgr     unix  n       -       n       300     1       oqmgr
+tlsmgr    unix  -       -       -       1000?   1       tlsmgr
+rewrite   unix  -       -       -       -       -       trivial-rewrite
+bounce    unix  -       -       -       -       0       bounce
+defer     unix  -       -       -       -       0       bounce
+trace     unix  -       -       -       -       0       bounce
+verify    unix  -       -       -       -       1       verify
+flush     unix  n       -       -       1000?   0       flush
+proxymap  unix  -       -       n       -       -       proxymap
+proxywrite unix -       -       n       -       1       proxymap
+smtp      unix  -       -       -       -       -       smtp
+relay     unix  -       -       -       -       -       smtp
+#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
+showq     unix  n       -       -       -       -       showq
+error     unix  -       -       -       -       -       error
+retry     unix  -       -       -       -       -       error
+discard   unix  -       -       -       -       -       discard
+local     unix  -       n       n       -       -       local
+virtual   unix  -       n       n       -       -       virtual
+lmtp      unix  -       -       -       -       -       lmtp
+anvil     unix  -       -       -       -       1       anvil
+scache    unix  -       -       -       -       1       scache
+#
+# ====================================================================
+# Interfaces to non-Postfix software. Be sure to examine the manual
+# pages of the non-Postfix software to find out what options it wants.
+#
+# Many of the following services use the Postfix pipe(8) delivery
+# agent.  See the pipe(8) man page for information about ${recipient}
+# and other message envelope options.
+# ====================================================================
+#
+# maildrop. See the Postfix MAILDROP_README file for details.
+# Also specify in main.cf: maildrop_destination_recipient_limit=1
+#
+maildrop  unix  -       n       n       -       -       pipe
+  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
+#
+# ====================================================================
+#
+# Recent Cyrus versions can use the existing "lmtp" master.cf entry.
+#
+# Specify in cyrus.conf:
+#   lmtp    cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4
+#
+# Specify in main.cf one or more of the following:
+#  mailbox_transport = lmtp:inet:localhost
+#  virtual_transport = lmtp:inet:localhost
+#
+# ====================================================================
+#
+# Cyrus 2.1.5 (Amos Gouaux)
+# Also specify in main.cf: cyrus_destination_recipient_limit=1
+#
+#cyrus     unix  -       n       n       -       -       pipe
+#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+#
+# ====================================================================
+# Old example of delivery via Cyrus.
+#
+#old-cyrus unix  -       n       n       -       -       pipe
+#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+#
+# ====================================================================
+#
+# See the Postfix UUCP_README file for configuration details.
+#
+uucp      unix  -       n       n       -       -       pipe
+  flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+#
+# Other external delivery methods.
+#
+ifmail    unix  -       n       n       -       -       pipe
+  flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
+bsmtp     unix  -       n       n       -       -       pipe
+  flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient
+scalemail-backend unix	-	n	n	-	2	pipe
+  flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension}
+mailman   unix  -       n       n       -       -       pipe
+  flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
+  ${nexthop} ${user}
+
diff --git a/templates/preseed.erb b/templates/preseed.erb
deleted file mode 100644
index 83dfb78..0000000
--- a/templates/preseed.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template for postfix preseeding
-postfix postfix/main_mailer_type select <%= @main_mailer_type %>
-postfix postfix/mailbox_limit string 0
-postfix postfix/relay_restrictions_warning boolean
-postfix postfix/tlsmgr_upgrade_warning boolean
-postfix postfix/root_address string <%= @root_address %>
-postfix postfix/chattr boolean false
-postfix postfix/relayhost string <%= @relayhost %>
-postfix postfix/procmail boolean false
-postfix postfix/rfc1035_violation boolean false
-postfix postfix/mailname string <%= @mailname %>
-postfix postfix/protocols select all
-postfix postfix/destinations string <%= @destinations.join(", ") %>
-postfix postfix/recipient_delim string +
-postfix postfix/sqlite_warning boolean
-postfix postfix/retry_upgrade_warning boolean
-postfix postfix/mynetworks string <%= @mynetworks.join(" ") %>
-postfix postfix/kernel_version_warning boolean
-postfix postfix/mydomain_warning boolean