diff --git a/amavisd-new.spec b/amavisd-new.spec
index 77509ed..3f15d87 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
 
 Name:          amavisd-new
 Version:       2.9.1
-Release:       1mamba
+Release:       2mamba
 Summary:       An interface between mailer (MTA) and content checkers: virus scanners, and/or SpamAssassin
 Group:         System/Servers
 Vendor:        openmamba
@@ -80,21 +80,27 @@ exit 0
 
 %post
 if [ $1 -ge 1 ]; then
-   FQDN=`hostname -f`
-   sed -i "s|# \$myhostname.*|\$myhostname = '$FQDN';|" %{_sysconfdir}/amavisd.conf
+   #FQDN=`hostname -f`
+   #sed -i "s|# \$myhostname.*|\$myhostname = '$FQDN';|" %{_sysconfdir}/amavisd.conf
+   DOMAIN=`hostname -d`
+   sed -i "s|# \$mydomain = .*|\$mydomain = '$DOMAIN';|" %{_sysconfdir}/amavisd.conf
    /sbin/chkconfig --add amavisd
    /sbin/service amavisd restart
    postconf -e "strict_rfc821_envelopes = yes"
+   sudo postconf -e "content_filter = smtp-amavis:[127.0.0.1]:10024"
    [ "`grep amavisfeed %{_sysconfdir}/postfix/master.cf`" ] || {
       cat >> %{_sysconfdir}/postfix/master.cf << _EOF
 # BEGIN of amavaisd-new configuration
-amavisfeed unix    -       -       n        -      2     lmtp
-     -o lmtp_data_done_timeout=1200
-     -o lmtp_send_xforward_command=yes
+smtp-amavis unix    -       -       n        -      2     smtp
+     -o smtp_data_done_timeout=1200
+     -o smtp_send_xforward_command=yes
      -o disable_dns_lookups=yes
      -o max_use=20
 127.0.0.1:10025 inet n    -       n       -       -     smtpd
      -o content_filter=
+     -o local_recipient_maps=
+     -o relay_recipient_maps=
+     -o smtpd_restriction_classes=
      -o smtpd_delay_reject=no
      -o smtpd_client_restrictions=permit_mynetworks,reject
      -o smtpd_helo_restrictions=
@@ -102,7 +108,6 @@ amavisfeed unix    -       -       n        -      2     lmtp
      -o smtpd_recipient_restrictions=permit_mynetworks,reject
      -o smtpd_data_restrictions=reject_unauth_pipelining
      -o smtpd_end_of_data_restrictions=
-     -o smtpd_restriction_classes=
      -o mynetworks=127.0.0.0/8
      -o smtpd_error_sleep_time=0
      -o smtpd_soft_error_limit=1001
@@ -137,6 +142,9 @@ exit 0
 %doc LICENSE TODO
 
 %changelog
+* Thu Jul 24 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.9.1-2mamba
+- small fixes to amavisd.conf and postfix configuration changes upon first install
+
 * Tue Jul 08 2014 Automatic Build System <autodist@mambasoft.it> 2.9.1-1mamba
 - automatic update by autodist