diff --git a/quota.changes b/quota.changes
index 33f1cb8..dcd3f95 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  4 10:51:57 UTC 2017 - tchvatal@suse.com
+
+- Enable ldapmail feature wrt bsc#1055450
+
 -------------------------------------------------------------------
 Tue Jan  5 10:23:28 UTC 2016 - tchvatal@suse.com
 
diff --git a/quota.spec b/quota.spec
index bbcac6a..90388d6 100644
--- a/quota.spec
+++ b/quota.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name:           quota
 Version:        4.03
 Release:        0
 Summary:        Disk Quota System
-License:        GPL-2.0 and BSD-3-Clause
+License:        GPL-2.0 AND BSD-3-Clause
 Group:          System/Filesystems
 Url:            http://sourceforge.net/projects/linuxquota/
 #Source0:        http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
@@ -34,14 +34,14 @@ Patch1:         0001-Set-fPIC-and-pie-as-default-params-when-building.patch
 Patch2:         %{name}-4.01-warnquota.patch
 # needed for Patch1
 BuildRequires:  automake
-BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
-BuildRequires:  pkg-config
+BuildRequires:  openldap2-devel
+BuildRequires:  pkgconfig
 BuildRequires:  tcpd-devel
+BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0) >= 3.1
 BuildRequires:  pkgconfig(libnl-genl-3.0)
 BuildRequires:  pkgconfig(systemd)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The quota subsystem allows a system administrator to set soft and hard
@@ -52,9 +52,9 @@ groups. The kernel must be compiled with disk quota support enabled
 %package nfs
 Summary:        Disk Quota System on NFS
 Group:          System/Filesystems
-# Require the services needed to be present for quotad service: portmap, nfsserver, network
 Requires:       nfs-kernel-server
 Requires:       quota = %{version}
+# Require the services needed to be present for quotad service: portmap, nfsserver, network
 Requires:       rpcbind
 Requires:       sysconfig
 Requires(post): %fillup_prereq
@@ -73,7 +73,7 @@ autoreconf -fvi
 %configure \
     --docdir=%{_docdir}/%{name} \
     --disable-silent-rules \
-    --disable-ldapmail \
+    --enable-ldapmail \
     --enable-rpcsetquota
 make %{?_smp_mflags}
 
@@ -110,7 +110,6 @@ cp %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-q
 %service_del_postun quotad.service
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %config %{_sysconfdir}/quotagrpadmins
 %config %{_sysconfdir}/quotatab
 %config %{_sysconfdir}/warnquota.conf
@@ -137,7 +136,6 @@ cp %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-q
 %{_sbindir}/xqmstats
 
 %files nfs
-%defattr(-,root,root)
 %{_sbindir}/rpc.rquotad
 %{_sbindir}/rcquotad
 %{_unitdir}/quotad.service