diff --git a/mozldap.spec b/mozldap.spec
index cf90463..393085c 100644
--- a/mozldap.spec
+++ b/mozldap.spec
@@ -4,15 +4,15 @@
 %define        libsuffix       %{major}0
 
 Name:          mozldap
-Version:       6.0.6
-Release:       2mamba
+Version:       6.0.7
+Release:       1mamba
 Summary:       Mozilla LDAP C SDK
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Automatic Build System <autodist@mambasoft.it>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://wiki.mozilla.org/LDAP_C_SDK
-Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/mozldap-%{version}.tar.gz
+Source0:       https://ftp.mozilla.org/pub/directory/c-sdk/releases/v%{version}/src/mozldap-%{version}.tar.gz
 Source1:       fix_headers.sh
 License:       GPL,MPL 1.1,LGPL
 ## AUTOBUILDREQ-BEGIN
@@ -35,8 +35,7 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description devel
 The Mozilla LDAP C SDK is a set of libraries that allow applications to communicate with LDAP directory servers.
-
-This package contains static libraries and header files need for development.
+This package contains static libraries and header files needed for development.
 
 %package tools
 Group:         Development/Tools
@@ -45,15 +44,15 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description tools
 The Mozilla LDAP C SDK is a set of libraries that allow applications to communicate with LDAP directory servers.
-
 This package provides the ldapsearch, ldapmodify, and ldapdelete tools that use the Mozilla LDAP C SDK libraries.
 
+%debug_package
+
 %prep
 %setup -q
 
 %build
-
-cd mozilla/directory/c-sdk
+cd c-sdk
 
 %configure \
 	--with-sasl \
@@ -83,6 +82,7 @@ make
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
+cd c-sdk
 mkdir -p %{buildroot}%{_exec_prefix}/lib/pkgconfig
 
 sed \
@@ -98,48 +98,43 @@ sed \
    -e "s,%%NSPR_VERSION%%,$(pkg-config --modversion nspr),g" \
    -e "s,%%NSS_VERSION%%,$(pkg-config --modversion nss),g" \
    -e "s,%%MOZLDAP_VERSION%%,%{version},g" \
-   mozilla/directory/c-sdk/mozldap.pc.in > \
+   mozldap.pc.in > \
    %{buildroot}%{_exec_prefix}/lib/pkgconfig/mozldap.pc
 
 mkdir -p %{buildroot}%{_includedir}/mozldap
-mkdir -p %{buildroot}%{_libdir}/mozldap
-mkdir -p %{buildroot}%{_datadir}/mozldap/etc
+mkdir -p %{buildroot}%{_datadir}/mozldap/{etc,bin}
+mkdir -p %{buildroot}%{_prefix}/lib/mozilla/plugins/
 
-
-for filel in mozilla/dist/lib/*.so ; do
-	install -m 755 $filel %{buildroot}%{_libdir}/
+for filel in ldap/libraries/lib*/*.so ; do
+	install -m 755 $filel %{buildroot}%{_prefix}/lib/mozilla/plugins/
 done
 
-for fileb in mozilla/dist/bin/ldap* ; do
-	install -m 755 $fileb %{buildroot}%{_libdir}/mozldap
+for fileb in ldap/clients/tools/bin/ldap* ; do
+	install -m 755 $fileb %{buildroot}%{_datadir}/mozldap/bin
 done
 
-for fileh in mozilla/dist/public/ldap/*.h ; do
+for fileh in ldap/include/*.h ; do
 	install -pm 644 $fileh %{buildroot}%{_includedir}/mozldap
 done
 
-cp -r mozilla/directory/c-sdk/ldap/examples %{buildroot}%{_datadir}/mozldap
+cp -r ldap/examples %{buildroot}%{_datadir}/mozldap
 
-install -m 644  mozilla/directory/c-sdk/ldap/examples/xmplflt.conf \
+install -m 644 ldap/examples/xmplflt.conf \
 	%{buildroot}%{_datadir}/mozldap/etc
 
-install -m 644  mozilla/directory/c-sdk/ldap/libraries/libldap/ldap{searchprefs,templates,filter}.conf \
+install -m 644 ldap/libraries/libldap/ldap{searchprefs,templates,filter}.conf \
 	%{buildroot}%{_datadir}/mozldap/etc
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libldap%{libsuffix}.so
-%{_libdir}/libldif%{libsuffix}.so
-%{_libdir}/libprldap%{libsuffix}.so
-%{_libdir}/libssldap%{libsuffix}.so
-%doc mozilla/directory/c-sdk/README.rpm
+%{_prefix}/lib/mozilla/plugins/lib*.so
+%doc c-sdk/README.rpm
 
 %files devel
 %defattr(-,root,root)
@@ -150,15 +145,13 @@ install -m 644  mozilla/directory/c-sdk/ldap/libraries/libldap/ldap{searchprefs,
 
 %files tools
 %defattr(-,root,root)
-%dir %{_libdir}/mozldap
-%{_libdir}/mozldap/ldapcmp
-%{_libdir}/mozldap/ldapcompare
-%{_libdir}/mozldap/ldapdelete
-%{_libdir}/mozldap/ldapmodify
-%{_libdir}/mozldap/ldappasswd
-%{_libdir}/mozldap/ldapsearch
+%dir %{_datadir}/mozldap/bin
+%{_datadir}/mozldap/bin/*
 
 %changelog
+* Mon Dec 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.7-1mamba
+- update to 6.0.7
+
 * Thu Oct 07 2021 Automatic Build System <autodist@mambasoft.it> 6.0.6-2mamba
 - automatic rebuild by autodist