diff --git a/postfix/etc.tar b/postfix/etc.tar
new file mode 100644
index 0000000000..d8bf2e2f27
Binary files /dev/null and b/postfix/etc.tar differ
diff --git a/postfix/postfix.spec b/postfix/postfix.spec
index 02b2cc077d..a9f9fc98cc 100644
--- a/postfix/postfix.spec
+++ b/postfix/postfix.spec
@@ -67,6 +67,7 @@ Source3:      ftp://ftp.kame.net/pub/kame/misc/postfix-%{V_ipv6}.diff.gz
 Source4:      http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.pl
 Source5:      rc.postfix
 Source6:      ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/snapshot-%{V_unstable}.tar.gz
+Source7:      etc.tar
 
 #   build information
 Prefix:       %{l_prefix}
@@ -110,6 +111,7 @@ Provides:     MTA
     %setup1 -q -T -D -a 1
 %endif
     %setup2 -q -T -D -a 2
+    %setup7 -q -T -D -a 7
 %if "%{branch}" == "stable"
     cd postfix-%{V_real}
 %else
@@ -230,11 +232,19 @@ Provides:     MTA
     ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/postfix
       %{l_shtool} mkdir -f -p -m 755 sample
       for cfg in access aliases canonical pcre_table regexp_table \
-                 relocated sample-* transport virtual main.cf.default; do
+                 relocated sample-* transport virtual \
+                 main.cf master.cf main.cf.default; do
           mv $cfg sample/
-      done 
+      done
     )
 
+    #   install default configuration
+    %{l_shtool} install -c -m 644 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_fsusr@;%{l_fsusr};g' \
+        -e 's;@l_npusr@;%{l_npusr};g' \
+        etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/
+
     #   pre-create variable stuff
     ( cd $RPM_BUILD_ROOT%{l_prefix}/var/postfix
       %{l_shtool} mkdir -f -p -m 700 \
@@ -275,10 +285,21 @@ Provides:     MTA
 %clean
     rm -rf $RPM_BUILD_ROOT
 
+%post
+    if [ $1 -eq 1 ]; then
+        (cd $RPM_INSTALL_PREFIX/etc/postfix; %{l_make} all >/dev/null 2>&1 || true)
+    elif [ $1 -gt 1 ]; then
+        (cd $RPM_INSTALL_PREFIX/etc/postfix; %{l_make} clean all >/dev/null 2>&1 || true)
+        $RPM_INSTALL_PREFIX/etc/rc postfix reload >/dev/null 2>&1 || true
+    fi
+
 %preun
-    $RPM_INSTALL_PREFIX/sbin/postfix stop
-    rm -rf $RPM_INSTALL_PREFIX/etc/postfix/prng_exch
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/pid/*
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/private/*
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/public/*
+    if [ $1 -eq 0 ]; then
+        $RPM_INSTALL_PREFIX/etc/rc postfix stop >/dev/null 2>&1 || true
+        (cd $RPM_INSTALL_PREFIX/etc/postfix/; %{l_make} clean >/dev/null 2>&1 || true)
+        rm -rf $RPM_INSTALL_PREFIX/etc/postfix/prng_exch
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/pid/*
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/private/*
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/public/*
+    fi