diff --git a/avr-libc.spec b/avr-libc.spec
index 5725cf0..36d8919 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -1,7 +1,6 @@
-%define        _avrdir  %{_prefix}/avr
-
+%define gitver %(echo %version | tr . _)
 Name:          avr-libc
-Version:       2.1.0
+Version:       2.2.0
 Release:       1mamba
 Summary:       High quality C library for use with GCC on Atmel AVR microcontrollers
 Group:         System/Libraries
@@ -9,7 +8,7 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.nongnu.org/avr-libc/
-Source:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-%{version}.tar.bz2
+Source:        https://github.com/avrdudes/avr-libc.git/avr-libc-%{gitver}-release/avr-libc-%{version}.tar.bz2
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
@@ -21,8 +20,12 @@ AVR Libc is a Free Software project whose goal is to provide a high quality C li
 
 %debug_package
 
+# force no files stripping
+%define __os_install_post /usr/lib/rpm/brp-compress
+
 %prep
 %setup -q
+./bootstrap
 
 %build
 %configure \
@@ -34,23 +37,26 @@ AVR Libc is a Free Software project whose goal is to provide a high quality C li
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall
 
-# force no files stripping 
-%define __os_install_post /usr/lib/rpm/brp-compress
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files
 %defattr(-,root,root)
 %{_bindir}/avr-man
-%{_avrdir}/include
-%{_avrdir}/lib
+%dir %{_prefix}/avr
+%dir %{_prefix}/avr/include
+%{_prefix}/avr/include/*
+%dir %{_prefix}/avr/lib
+%{_prefix}/avr/lib/*
 %dir %{_docdir}/avr-libc-%{version}
 %{_docdir}/avr-libc-%{version}/*
 %doc AUTHORS LICENSE
 #ChangeLog* NEWS README
 
 %changelog
+* Sun Jun 23 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.0-1mamba
+- update to 2.2.0
+
 * Mon Jan 31 2022 Automatic Build System <autodist@mambasoft.it> 2.1.0-1mamba
 - automatic version update by autodist