diff --git a/hiawatha.changes b/hiawatha.changes
index 05c589f..165f945 100644
--- a/hiawatha.changes
+++ b/hiawatha.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep 10 16:04:57 UTC 2014 - jengelh@inai.de
+
+- Avoid generating libpolarssl.so.7, which led to "have choice
+  for libpolarssl.so.7: libpolarssl7 hiawatha" and make other
+  polarssl-using applications not run in practice because the
+  library is in a non-standard directory, yet discovered by rpm
+  as a provider.
+
 -------------------------------------------------------------------
 Sun Sep  7 23:29:36 UTC 2014 - fisiu@opensuse.org
 
diff --git a/hiawatha.spec b/hiawatha.spec
index fe54eab..4515f1f 100644
--- a/hiawatha.spec
+++ b/hiawatha.spec
@@ -34,6 +34,7 @@ Source101:      %{name}-ssl.firewall
 BuildRequires:  cmake >= 2.8.4
 BuildRequires:  libxslt-devel
 BuildRequires:  pkg-config
+BuildRequires:  polarssl-devel
 BuildRequires:  systemd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       logrotate
@@ -76,13 +77,14 @@ cmake .. \
     -DENABLE_TOMAHAWK=On \
     -DENABLE_TOOLKIT=On \
     -DENABLE_XSLT=On \
-    -DENABLE_ZLIB_SUPPORT=On
+    -DENABLE_ZLIB_SUPPORT=On \
+    -DUSE_SYSTEM_POLARSSL=on
 
 make %{?_smp_mflags}
 
 %install
 cd build
-%makeinstall
+%make_install
 install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
@@ -118,8 +120,6 @@ rm -vf %{buildroot}%{_libdir}/%{name}/libpolarssl.so
 %{_sbindir}/wigwam
 %attr(0755,root,root) %verify(not mode) %{_sbindir}/cgi-wrapper
 %{_unitdir}/%{name}.service
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libpolarssl.so*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/cgi-wrapper.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf