diff --git a/libbonobo.spec b/libbonobo.spec
index f7b7887..7165112 100644
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -2,7 +2,7 @@
 
 Name:          libbonobo
 Version:       2.32.1
-Release:       1mamba
+Release:       2mamba
 Summary:       Bonobo is a component and compound document system for GNOME
 Group:         System/Libraries
 Vendor:        openmamba
@@ -28,6 +28,7 @@ BuildRequires: libz-devel
 BuildRequires: ORBit2-devel
 BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
+Requires:      %{name}-tools = %{?epoch:%epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -42,8 +43,17 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description devel
 Bonobo is a set of language and system independant CORBA interfaces for creating reusable components, controls and creating compound documents.
 The Bonobo distribution includes a Gtk+ based implementation of the Bonobo interfaces, enabling developers to create reusable components and applications that can be used to form more complex documents.
+This package contains static libraries and header files needed for development.
 
-This package contains static libraries and header files need for development.
+%package tools
+Summary:       Tools provided with libbonobo
+Group:         System/Tools
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description tools
+Bonobo is a set of language and system independant CORBA interfaces for creating reusable components, controls and creating compound documents.
+The Bonobo distribution includes a Gtk+ based implementation of the Bonobo interfaces, enabling developers to create reusable components and applications that can be used to form more complex documents.
+This package contains the tools provided with libbonobo.
 
 %package apidocs
 Summary:       %{pkgname} API documentation
@@ -53,11 +63,15 @@ Requires:      gtk-doc
 %description apidocs
 %{pkgname} API documentation.
 
+%debug_package
+
 %prep
 %setup -q
+sed -i "s,| arm-\*  |,| aarch64-\* | arm-\*  |," config.sub
+sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in
 
 %build
-%configure --libexecdir=%{_sbindir} --enable-gtk-doc
+%configure --libexecdir=%{_sbindir}
 %make
 
 %install
@@ -72,7 +86,17 @@ Requires:      gtk-doc
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f libbonobo-2.0.lang
+%files
+%defattr(-,root,root)
+%{_libdir}/orbit-2.0/*
+%{_libdir}/libbonobo-2.so.*
+%{_libdir}/libbonobo-activation.so.*
+%dir %{_libdir}/bonobo
+%{_libdir}/bonobo/*
+%dir %{_libdir}/bonobo-2.0
+%{_libdir}/bonobo-2.0/*
+
+%files tools -f libbonobo-2.0.lang
 %defattr(-,root,root)
 %{_bindir}/*
 %{_sbindir}/*
@@ -83,24 +107,20 @@ Requires:      gtk-doc
 %dir %{_datadir}/idl/bonobo-2.0
 %{_datadir}/idl/bonobo-2.0/*
 %{_mandir}/man1/*
-%{_libdir}/orbit-2.0/*
-%{_libdir}/libbonobo-2.so.*
-%{_libdir}/libbonobo-activation.so.*
-%dir %{_libdir}/bonobo
-%{_libdir}/bonobo/*
-%dir %{_libdir}/bonobo-2.0
-%{_libdir}/bonobo-2.0/*
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
 %dir %{_includedir}/libbonobo-2.0
 %{_includedir}/libbonobo-2.0/*
 %dir %{_includedir}/bonobo-activation-2.0
 %{_includedir}/bonobo-activation-2.0/*
+%{_libdir}/pkgconfig/*
+%{_libdir}/libbonobo-2.a
+%{_libdir}/libbonobo-2.la
+%{_libdir}/libbonobo-2.so
+%{_libdir}/libbonobo-activation.a
+%{_libdir}/libbonobo-activation.la
+%{_libdir}/libbonobo-activation.so
 
 %files apidocs
 %defattr(-,root,root)
@@ -108,6 +128,9 @@ Requires:      gtk-doc
 %{_datadir}/gtk-doc/html/bonobo-activation/
 
 %changelog
+* Thu Dec 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.32.1-2mamba
+- rebuilt with debug package, aarch64 build fix, -tools subpackage, disable gtkdoc
+
 * Mon Apr 04 2011 Automatic Build System <autodist@mambasoft.it> 2.32.1-1mamba
 - automatic update by autodist