diff --git a/.gitignore b/.gitignore
index f7a8ded..a4d7b7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /avrdude-5.11.tar.gz
 /avrdude-5.11.1.tar.gz
 /avrdude-6.0.1.tar.gz
+/avrdude-6.1.tar.gz
diff --git a/avrdude-6.1_includes.patch b/avrdude-6.1_includes.patch
new file mode 100644
index 0000000..5fc8904
--- /dev/null
+++ b/avrdude-6.1_includes.patch
@@ -0,0 +1,13 @@
+diff -p -up ./configure.org ./configure
+--- ./configure.org     2014-06-04 21:00:03.027735142 +0200
++++ ./configure 2014-06-04 21:04:46.428267513 +0200
+@@ -5650,7 +5650,8 @@ fi
+ LIBPTHREAD=$LIBPTHREAD
+ 
+ # Checks for header files.
+-for ac_header in limits.h stdlib.h string.h
++for ac_header in limits.h stdlib.h string.h inttypes.h stdint.h memory.h \
++			strings.h sys/stat.h sys_time.h sys_types.h termios.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/avrdude.spec b/avrdude.spec
index 94b7749..338e82b 100644
--- a/avrdude.spec
+++ b/avrdude.spec
@@ -1,8 +1,8 @@
 %global udev_rules 70-avrdude_usbprog.rules
 
 Name:           avrdude
-Version:        6.0.1
-Release:        3%{?dist}
+Version:        6.1
+Release:        1%{?dist}
 Summary:        Software for programming Atmel AVR Microcontroller
 
 Group:          Applications/Engineering
@@ -10,6 +10,8 @@ License:        GPLv2+
 URL:            http://www.nongnu.org/avrdude
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
 Source1:        avrdude-udev-rules
+# From: http://savannah.nongnu.org/bugs/?42517
+Patch0:         avrdude-6.1_includes.patch
 
 BuildRequires:  flex
 BuildRequires:  bison
@@ -34,6 +36,7 @@ particular chip.
 
 %prep
 %setup -q
+%patch0 -p0
 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
@@ -75,6 +78,9 @@ fi
 
 
 %changelog
+* Sat Jun 14 2014 Hans de Goede <hdegoede@redhat.com> - 6.1-1
+- Upgrade to new upstream release 6.1 (rhbz#1056138)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index a60cd78..38dfb2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-346ec2e46393a54ac152b95abf1d9850  avrdude-6.0.1.tar.gz
+9db8c25b935d34234b9b1ba16ad55fd5  avrdude-6.1.tar.gz