diff --git a/libid3.spec b/libid3.spec
index 4a37cca..37b22ac 100644
--- a/libid3.spec
+++ b/libid3.spec
@@ -1,13 +1,13 @@
 Name:          libid3
 Version:       3.8.3
-Release:       5mamba
+Release:       6mamba
 Summary:       A software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.id3lib.org/
-Source:        http://cesnet.dl.sourceforge.net/sourceforge/id3lib/id3lib-%{version}.tar.gz
+Source:        http://downloads.sourceforge.net/sourceforge/id3lib/id3lib-%{version}.tar.gz
 Patch0:        %{name}-3.8.3-gcc43-1.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
@@ -24,15 +24,27 @@ A software development library for reading, writing, and manipulating ID3v1 and
 %package devel
 Summary:       Header files and static library for development with libid3
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-tools = %{?epoch:%epoch:}%{version}-%{release}
 
 %description devel
 A software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags.
+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 libid3
+Group:         System/Tools
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description tools
+A software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags.
+This package contains the tools provided with libid3.
+
+%debug_package
 
 %prep
 %setup -q -n id3lib-%{version}
+sed -i "s,| arm-\*  |,| aarch64-\* | arm-\*  |," config.sub
 %patch0 -p1
 
 %build
@@ -48,19 +60,26 @@ This package contains static libraries and header files need for development.
 
 %files
 %defattr(-,root,root)
-%{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/libid3*.so.*
+%doc AUTHORS COPYING
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_libdir}/*.so
+%{_libdir}/libid3*.a
+%{_libdir}/libid3*.la
+%{_libdir}/libid3*.so
 %{_includedir}/*.h
 %dir %{_includedir}/id3
 %{_includedir}/id3/*.h
 
+%files tools
+%defattr(-, root, root)
+%{_bindir}/id3*
+
 %changelog
+* Wed Dec 02 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.8.3-6mamba
+- added debug package, aarch64 build fix, tools subpackage
+
 * Fri Apr 30 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 3.8.3-5mamba
 - added patch to build with gcc 4.3