diff --git a/.gitignore b/.gitignore
index 4505726..f7a8ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /avrdude-5.10.tar.gz
 /avrdude-5.11.tar.gz
 /avrdude-5.11.1.tar.gz
+/avrdude-6.0.1.tar.gz
diff --git a/avrdude-udev-rules b/avrdude-udev-rules
new file mode 100644
index 0000000..14b7922
--- /dev/null
+++ b/avrdude-udev-rules
@@ -0,0 +1,17 @@
+# Atmel AVR ISP mkII
+SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2103", TAG+="uaccess"
+
+# Atmel Corp. JTAG ICE mkII
+SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2104", TAG+="uaccess"
+
+# Atmel Corp. JTAGICE3
+SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2110", TAG+="uaccess"
+
+# usbprog bootloader
+ATTRS{idVendor}=="1781", ATTRS{idProduct}=="0c62", TAG+="uaccess"
+
+# USBasp programmer
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
+
+# USBtiny programmer
+ATTRS{idVendor}=="1781", ATTRS{idProduct}=="0c9f", TAG+="uaccess"
diff --git a/avrdude.spec b/avrdude.spec
index 1b35753..5711d4b 100644
--- a/avrdude.spec
+++ b/avrdude.spec
@@ -1,17 +1,15 @@
+%global udev_rules 70-avrdude_usbprog.rules
+
 Name:           avrdude
-Version:        5.11.1
-Release:        5%{?dist}
+Version:        6.0.1
+Release:        1%{?dist}
 Summary:        Software for programming Atmel AVR Microcontroller
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.nongnu.org/avrdude
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-
-Patch0:         avrdude-5.11.1-fix-texi-errors.patch
-Patch1:         avrdude-aarch64.patch
-
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source1:        avrdude-udev-rules
 
 BuildRequires:  flex
 BuildRequires:  bison
@@ -25,7 +23,6 @@ BuildRequires:  tetex-dvips
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-
 %description
 AVRDUDE is a program for programming Atmel's AVR CPU's. It can program the 
 Flash and EEPROM, and where supported by the serial programming protocol, it 
@@ -37,10 +34,6 @@ particular chip.
 
 %prep
 %setup -q
-
-%patch0 -p1
-%patch1 -p1
-
 chmod -x safemode.c doc/TODO
 sed -i 's|/usr/local/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
 sed -i 's|/etc/avrdude.conf|/etc/avrdude/avrdude.conf|g' doc/avrdude.texi avrdude.1
@@ -50,28 +43,22 @@ iconv -f ISO88591 -t UTF8 < NEWS > NEWS~
 mv NEWS~ NEWS
 
 
-
-
 %build
 %configure --enable-doc --sysconfdir=%{_sysconfdir}/%{name}
 make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} installed-docs
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_udevrulesdir}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevrulesdir}/%{udev_rules}
 
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -79,15 +66,18 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc README AUTHORS ChangeLog* COPYING NEWS doc/TODO installed-docs/*
 %config(noreplace) %{_sysconfdir}/%{name}
+%{_udevrulesdir}/%{udev_rules}
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 %{_infodir}/%{name}.info.gz
 
 
 %changelog
+* Sat Mar 08 2014 Hans de Goede <hdegoede@redhat.com> - 6.0.1-1
+- Upgrade to new upstream release 6.0.1 (rhbz#1056138)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 6444582..a60cd78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a43e288cb32916703b6945e3f260df9  avrdude-5.11.1.tar.gz
+346ec2e46393a54ac152b95abf1d9850  avrdude-6.0.1.tar.gz