diff --git a/.gitignore b/.gitignore
index 47c18ef..99aca86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ avr-libc-user-manual-1.7.0.tar.bz2
 /avr-libc-manpages-1.8.0.tar.bz2
 /avr-libc-user-manual-1.8.0.pdf.bz2
 /avr-libc-user-manual-1.8.0.tar.bz2
+/avr-headers-6.1.3.1475.zip
+/avr-patches.tar.gz
diff --git a/avr-libc.spec b/avr-libc.spec
index d9a3405..adf0f6d 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -7,7 +7,7 @@
 
 Name:           avr-libc
 Version:        1.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for use with GCC on Atmel AVR microcontrollers
 Group:          Development/Tools
 License:        BSD
@@ -17,6 +17,8 @@ Source1:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-manp
 Source2:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
 Source3:        http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.pdf.bz2
 Patch0:         avr-libc-1.6.4-documentation.patch
+Source4:        http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.2/avr/avr-patches.tar.gz
+Source5:        http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.2/avr/avr-headers-6.1.3.1475.zip
 
 BuildRequires:  avr-gcc 
 BuildArch:      noarch
@@ -44,8 +46,19 @@ access these).
 
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -a 4 -a 5
 %patch0 -p0
+I=0
+for f in avr-patches/avr-libc/*.patch
+do
+  echo $f
+  patch -p0 <$f
+done
+for i in ./avr-headers//io[0-9a-zA-Z]*.h
+do
+  cp $i include/avr/ -v
+done
+
 
 # Add html docs
 mkdir html
@@ -68,6 +81,7 @@ sed -i 's|@DOC_INST_DIR@/man|%{_prefix}/avr/share/man|' scripts/avr-man.in
 
 
 %build
+./bootstrap
 # The ps doc ways in at 7Mb versus 2.5 for the pdf and has little added value
 ./configure --prefix=%{_prefix} --host=avr --build=`./config.guess` #--enable-doc
 # don't use %{?_smp_mflags}, it breaks the build
@@ -120,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc pdf/*
 
 %changelog
+* Wed Jun 26 2013 Michal Hlavinka <mhlavink@redhat.com> - 1.8.0-3
+- use more atmel's patches to support more MCUs (#972384)
+
 * Tue Dec 04 2012 Michal Hlavinka <mhlavink@redhat.com> - 1.8.0-2
 - fix avr-libc-docs -> avr-libc-doc transition (#883339)
 
@@ -155,9 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Nov 25 2009 Thibault North <tnorth AT fedoraproject DOT org> 1.6.5-1
 - Updated to 1.6.7 
 
-* Fri Nov 20 2009 Thibault North <tnorth AT fedoraproject DOT org> 1.6.5-1
-- New upstream release
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index ec986a9..1693e41 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,5 @@
 35af895d775015731b77d027a9e07cca  avr-libc-manpages-1.8.0.tar.bz2
 dbdc7b66262f930c82f8ebf94e15f225  avr-libc-user-manual-1.8.0.pdf.bz2
 d8a02a987cc0ea447348e0b6a08ab679  avr-libc-user-manual-1.8.0.tar.bz2
+07eecfb18f90a859593758b34186863c  avr-headers-6.1.3.1475.zip
+cebd8222af9bec2941a930db1a5da917  avr-patches.tar.gz