diff --git a/OpenSP.spec b/OpenSP.spec
index 4d6c8aa..245d9d0 100644
--- a/OpenSP.spec
+++ b/OpenSP.spec
@@ -1,6 +1,6 @@
 Name:          OpenSP
 Version:       1.5.2
-Release:       4mamba
+Release:       5mamba
 Summary:       A suite of SGML processing tools
 Group:         Applications/Publishing
 Vendor:        openmamba
@@ -12,15 +12,18 @@ Patch0:        OpenSP-1.5.1-LITLEN-1.patch
 Patch1:        OpenSP-1.5.1-gcc34-1.patch
 Patch2:        OpenSP-1.5.1-gcc41.patch
 License:       GPL
-Requires:      libosp = %{version}-%{release}
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: libe2fs-devel
 BuildRequires: libgcc
+BuildRequires: libkrb5-devel
+BuildRequires: libnsl-devel
 BuildRequires: libstdc++6-devel
+BuildRequires: libtirpc-devel
 ## AUTOBUILDREQ-END
 BuildRequires: sgml-common
 BuildRequires: xmlto
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
+Requires:      libosp = %{version}-%{release}
 
 %description
 A suite of SGML processing tools.
@@ -29,7 +32,7 @@ A suite of SGML processing tools.
 Summary:       Libraries for OpenSP
 Group:         System/Libraries
 Provides:      libOpenSP
-Obsoletes:     libOpenSP
+Obsoletes:     libOpenSP < 1.5.2-5mamba
 
 %description -n libosp
 OpenSP is a suite of SGML processing tools.
@@ -40,7 +43,7 @@ Summary:       Devel package for OpenSP
 Group:         Development/Libraries
 Requires:      libosp = %{version}-%{release}
 Provides:      libOpenSP-devel
-Obsoletes:     libOpenSP-devel
+Obsoletes:     libOpenSP-devel < 1.5.2-5mamba
 
 %description -n libosp-devel
 OpenSP is a suite of SGML processing tools.
@@ -60,13 +63,17 @@ sed -i "s,| arm-\*  |,| aarch64-\* | arm-\*  |," config.sub
    --enable-http \
    --enable-xml-messages \
    --enable-default-catalog=/etc/sgml/catalog \
-   --enable-default-search-path=%{_datadir}/sgml
+   --enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml \
+   --enable-xml-messages
 
-%make pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
+%make
+#pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
 
 %install
-test x%{buildroot} != x/ && rm -rf %{buildroot}
-%makeinstall pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+%makeinstall
+#pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
+
 ln -s onsgmls %{buildroot}%{_bindir}/nsgmls
 ln -s osgmlnorm %{buildroot}%{_bindir}/sgmlnorm
 ln -s ospam %{buildroot}%{_bindir}/spam
@@ -79,7 +86,7 @@ ln -s libosp.so %{buildroot}%{_libdir}/libsp.so
 %find_lang sp5
 
 %clean
-test x%{buildroot} != x/ && rm -rf %{buildroot}
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files
 %defattr(-,root,root)
@@ -98,8 +105,8 @@ test x%{buildroot} != x/ && rm -rf %{buildroot}
 #%{_bindir}/sx
 %dir %{_datadir}/doc/OpenSP
 %{_datadir}/doc/OpenSP/*
-%dir %{_datadir}/sgml/OpenSP-%{version}
-%{_datadir}/sgml/OpenSP-%{version}/*
+%dir %{_datadir}/OpenSP
+%{_datadir}/OpenSP/*
 %{_mandir}/man1/*
 
 %files -n libosp -f sp5.lang
@@ -117,6 +124,9 @@ test x%{buildroot} != x/ && rm -rf %{buildroot}
 %{_libdir}/libsp.so
 
 %changelog
+* Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.2-5mamba
+- rebuilt with %{_datadir}/xml added to --enable-default-search-path and --enable-xml-messages; remove pkgdatadir in make
+
 * Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.2-4mamba
 - build require sgml-common, added debug package