--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/22 08:38:15	1.16
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/22 21:23:33	1.17
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.15 2016/04/21 15:52:36 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.16 2016/04/22 08:38:15 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 16
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,6 +25,7 @@ Patch11: smeserver-qpsmtpd-2.6.0-helo_de
 Patch12: smeserver-qpsmtpd-2.6.0-use_naughty_plugin.patch
 Patch13: smeserver-qpsmtpd-2.6.0-karma_before_earlytalker.patch
 Patch14: smeserver-qpsmtpd-2.6.0-external_badrcptto.patch
+Patch15: smeserver-qpsmtpd-2.6.0-smtpd_to_qpsmtpd.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
@@ -57,6 +58,9 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-17.sme
+- Merge smtpd entry into qpsmtpd, same for ssmtpd into sqpsmtpd [SME: 9478]
+
 * Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-16.sme
 - Use an additional badrcptto file list for external connections so
   local only pseudonymes work as expected [SME: 9460] [SME: 4597]
@@ -808,6 +812,7 @@ SME Server qpsmtpd smtpd module
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks