diff --git a/libesmtp.changes b/libesmtp.changes
index 3c142ae..722873b 100644
--- a/libesmtp.changes
+++ b/libesmtp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Mar  3 16:32:02 UTC 2018 - jengelh@inai.de
+
+- Drop ineffective --with-pic. Drop %__-type macro indirections.
+  Drop redundant %clean section.
+- Implement shared library packaging guideline.
+
 -------------------------------------------------------------------
 Fri Feb 16 20:12:12 UTC 2018 - crrodriguez@opensuse.org
 
diff --git a/libesmtp.spec b/libesmtp.spec
index 0bfc85b..c545d27 100644
--- a/libesmtp.spec
+++ b/libesmtp.spec
@@ -17,6 +17,7 @@
 
 
 Name:           libesmtp
+%define lname	libesmtp6
 Version:        1.0.6
 Release:        0
 Summary:        A Library for Posting Electronic Mail
@@ -37,22 +38,32 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libESMTP is a library to manage posting (or submission of) electronic
-mail using SMTP to a preconfigured Mail Transport Agent (MTA) such as
-Exim. It may be used as part of a Mail User Agent (MUA) or another
-program that must be able to post electronic mail but where mail
-functionality is not that program's primary purpose.
+mail using SMTP to a preconfigured Mail Transport Agent (MTA). It may
+be used as part of a Mail User Agent (MUA) or another program that
+must be able to post electronic mail but where mail functionality is
+not that program's primary purpose.
+
+%package -n %lname
+Summary:        A Library for Posting Electronic Mail
+Group:          System/Libraries
+
+%description -n %lname
+libESMTP is a library to manage posting (or submission of) electronic
+mail using SMTP to a preconfigured Mail Transport Agent (MTA). It may
+be used as part of a Mail User Agent (MUA) or another program that
+must be able to post electronic mail but where mail functionality is
+not that program's primary purpose.
 
 %package devel
 Summary:        A Library for Posting Electronic Mail
 Group:          Development/Libraries/C and C++
-Requires:       libesmtp = %{version}
+Requires:       %lname = %version
 
 %description devel
 libESMTP is a library to manage posting (or submission of) electronic
-mail using SMTP to a preconfigured Mail Transport Agent (MTA) such as
-Exim. It may be used as part of a Mail User Agent (MUA) or another
-program that must be able to post electronic mail but where mail
-functionality is not that program's primary purpose.
+mail using SMTP to a preconfigured Mail Transport Agent (MTA).
+
+This subpackage contains the API definition files.
 
 %prep
 %setup -q
@@ -60,32 +71,25 @@ functionality is not that program's primary purpose.
 %patch1
 %patch2 -p1
 %patch3 -p1
+
 %build
 autoreconf -fiv
-%configure --with-openssl=yes --disable-static --with-pic \
-		--enable-ntlm 		\
-		--enable-etrn 		\
-		--disable-isoc
-%{__make} %{?_smp_mflags}
+%configure --with-openssl=yes --disable-static --enable-ntlm --enable-etrn \
+	--disable-isoc --with-auth-plugin-dir="%_libdir/%lname-plugins"
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-#uses dlsym not ltdl ..useless files
-rm -rf %{buildroot}%{_libdir}/esmtp-plugins/*a
-rm -rf %{buildroot}%{_libdir}/*a
+%make_install
+# library uses dlsym not ltdl
+find "%buildroot" -type f -name "*.la" -delete
 
-%clean
-rm -rf %{buildroot}
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
+%files -n %lname
 %defattr(-,root,root)
 %doc README AUTHORS ChangeLog COPYING
-%dir %{_libdir}/esmtp-plugins
-%{_libdir}/esmtp-plugins/*so*
+%_libdir/%lname-plugins/
 %{_libdir}/libesmtp.*so.*
 
 %files devel