diff --git a/postfix.changes b/postfix.changes
index a9f5e58..88c28f7 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  4 10:58:28 UTC 2017 - varkoly@suse.com
+
+- bnc#1059512 L3: Postfix Problem 
+
 -------------------------------------------------------------------
 Thu Sep 28 08:44:41 UTC 2017 - varkoly@suse.com
 
diff --git a/postfix.spec b/postfix.spec
index 3f7da6b..6a1567a 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -27,8 +27,9 @@
 #
 %define pf_docdir            %{_docdir}/%{name}-doc
 %define pf_config_directory  %{_sysconfdir}/%{name}
-%define pf_daemon_directory  /usr/lib/%{name}
+%define pf_daemon_directory  /usr/lib/%{name}/bin/
 %define _libexecdir          /usr/lib
+%define pf_shlib_directory   /usr/lib/%{name} 
 %define pf_command_directory %{_prefix}/sbin
 %define pf_queue_directory   var/spool/%{name}
 %define pf_sendmail_path     %{_sbindir}/sendmail
@@ -357,7 +358,7 @@ cat conf/main.cf
 	   "disable_vrfy_command = yes" \
 	   'smtpd_banner      = $myhostname ESMTP'
 #Set Permissions
-install -m 644 %{name}-SuSE/%{name}-files %{buildroot}%{_libexecdir}/postfix/postfix-files
+install -m 644 %{name}-SuSE/%{name}-files %{buildroot}%{pf_shlib_directory}/postfix-files
 # postfix-mysql
 install -m 644 %{name}-mysql/main.cf-mysql %{buildroot}%{_sysconfdir}/%{name}/main.cf-mysql
 install -m 640 %{name}-mysql/*_maps.cf     %{buildroot}%{_sysconfdir}/%{name}/
@@ -391,7 +392,7 @@ ln -s -f %{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %fdupes %{buildroot}%{pf_docdir}
 %fdupes %{buildroot}%{_mandir}
 %endif
-for path in %{buildroot}%{_libexecdir}/%{name}/libpostfix-*.so
+for path in %{buildroot}%{pf_shlib_directory}/libpostfix-*.so
 do
   test -e "$path" || continue
   name=${path##*/}
@@ -550,7 +551,7 @@ fi
 FILE=etc/%{name}/dynamicmaps.cf
 if ! grep -q "^pgsql[[:space:]]" ${FILE}; then
      echo "Adding pgsql map entry to ${FILE}"
-     echo "pgsql   %{_libexecdir}/%{name}/dict_pgsql.so      dict_pgsql_open" >> ${FILE}
+     echo "pgsql   %{pf_shlib_directory}/dict_pgsql.so      dict_pgsql_open" >> ${FILE}
 fi
 # ---------------------------------------------------------------------------
 
@@ -558,7 +559,7 @@ fi
 FILE=etc/%{name}/dynamicmaps.cf
 if ! grep -q "^mysql[[:space:]]" ${FILE}; then
      echo "Adding mysql map entry to ${FILE}"
-     echo "mysql   %{_libexecdir}/%{name}/dict_mysql.so      dict_mysql_open" >> ${FILE}
+     echo "mysql   %{pf_shlib_directory}/dict_mysql.so      dict_mysql_open" >> ${FILE}
 fi
 # ---------------------------------------------------------------------------
 
@@ -597,7 +598,7 @@ fi
 %config %{_sysconfdir}/permissions.d/%{name}
 %config %{_sysconfdir}/permissions.d/%{name}.paranoid
 %attr(0644, root, root) %config %{_sysconfdir}/%{name}/makedefs.out
-%{_libexecdir}/%{name}/%{name}-files
+%{pf_shlib_directory}/%{name}-files
 # create our default postfix ssl DIR (/etc/postfix/ssl)
 %dir %{_sysconfdir}/postfix/ssl
 %dir %{_sysconfdir}/postfix/ssl/certs
@@ -633,17 +634,17 @@ fi
 %{_sbindir}/rc%{name}
 %{_libdir}/lib*
 %{_libexecdir}/sendmail
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/*[^.so]
-%{_libexecdir}/%{name}/postfix-ldap.so
-%{_libexecdir}/%{name}/postfix-pcre.so
-%{_libexecdir}/%{name}/libpostfix-dns.so
-%{_libexecdir}/%{name}/libpostfix-global.so
-%{_libexecdir}/%{name}/libpostfix-master.so
-%{_libexecdir}/%{name}/libpostfix-tls.so
-%{_libexecdir}/%{name}/libpostfix-util.so
-%{_libexecdir}/%{name}/main.cf.proto
-%{_libexecdir}/%{name}/master.cf.proto
+%dir %{pf_shlib_directory}
+%{pf_shlib_directory}/*[^.so]
+%{pf_shlib_directory}/postfix-ldap.so
+%{pf_shlib_directory}/postfix-pcre.so
+%{pf_shlib_directory}/libpostfix-dns.so
+%{pf_shlib_directory}/libpostfix-global.so
+%{pf_shlib_directory}/libpostfix-master.so
+%{pf_shlib_directory}/libpostfix-tls.so
+%{pf_shlib_directory}/libpostfix-util.so
+%{pf_shlib_directory}/main.cf.proto
+%{pf_shlib_directory}/master.cf.proto
 
 %{conf_backup_dir}
 %dir %attr(0700,%{name},root) %{pf_data_directory}
@@ -676,16 +677,16 @@ fi
 %doc %{name}-mysql/%{name}-mysql.sql
 %config(noreplace) %attr(640, root, %{name}) %{_sysconfdir}/%{name}/*_maps.cf
 %config(noreplace) %{_sysconfdir}/%{name}/main.cf-mysql
-%{_libexecdir}/%{name}/postfix-mysql.so
+%{pf_shlib_directory}/postfix-mysql.so
 
 %files postgresql
 %defattr(-,root,root)
-%{_libexecdir}/%{name}/postfix-pgsql.so
+%{pf_shlib_directory}/postfix-pgsql.so
 
 %if %{with lmdb}
 %files lmdb
 %defattr(-,root,root)
-%{_libexecdir}/%{name}/postfix-lmdb.so
+%{pf_shlib_directory}/postfix-lmdb.so
 %endif
 
 %changelog