diff --git a/.cvsignore b/.cvsignore
index fd6ffc5..53cf7d7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-avrdude-5.5.tar.gz
+avrdude-5.8.tar.gz
diff --git a/avrdude-5.5.usbtiny.64bit.patch b/avrdude-5.5.usbtiny.64bit.patch
deleted file mode 100644
index 48bdcd6..0000000
--- a/avrdude-5.5.usbtiny.64bit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- avrdude-5.5/usbtiny.c	2007-10-29 09:40:04.000000000 -0600
-+++ avrdude-5.5.patched/usbtiny.c	2008-01-06 07:13:41.000000000 -0700
-@@ -138,7 +138,7 @@
-     fprintf( stderr, "Operation %d not defined for this chip!\n", op );
-     return -1;
-   }
--  memset(cmd, 0, sizeof(cmd));
-+  memset(cmd, 0, 4);
-   avr_set_bits(p->op[op], cmd);
- 
-   return pgm->cmd(pgm, cmd, res);
-@@ -286,19 +286,19 @@
-   int nbytes;
- 
-   // Make sure its empty so we don't read previous calls if it fails
--  memset(res, '\0', sizeof(res) );
-+  memset(res, '\0', 4 );
- 
-   nbytes = usb_in( USBTINY_SPI,
- 		   (cmd[1] << 8) | cmd[0],  // convert to 16-bit words
- 		   (cmd[3] << 8) | cmd[2],  //  "
--			res, sizeof(res), 8 * sck_period );
-+			res, 4, 8 * sck_period );
-   if (verbose > 1) {
-     // print out the data we sent and received
--    printf( "CMD: [%02x %02x %02x %02x] [%02x %02x %02x %02x]\n",
-+    printf( "CMD: [%02x %02x %02x %02x] [%02x %02x %02x %02x] \n",
- 	    cmd[0], cmd[1], cmd[2], cmd[3],
- 	    res[0], res[1], res[2], res[3] );
-   }
--  return ((nbytes == sizeof(res)) &&      // should have read 4 bytes
-+  return ((nbytes == 4) &&      // should have read 4 bytes
- 	  res[2] == cmd[1]);              // AVR's do a delayed-echo thing
- }
- 
diff --git a/avrdude.spec b/avrdude.spec
index e8402c6..3d21105 100644
--- a/avrdude.spec
+++ b/avrdude.spec
@@ -1,13 +1,12 @@
 Name:           avrdude
-Version:        5.5
-Release:        5%{?dist}
+Version:        5.8
+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.5.usbtiny.64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -33,7 +32,6 @@ particular chip.
 
 %prep
 %setup -q
-%patch0 -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
@@ -81,8 +79,9 @@ fi
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Sep 3 2009 Bart Vanbrabant <bart.vanbrabant@zoeloelip.be> - 5.8-1
+- New upstream version: See the NEWS file for more information
+- Removed patch: changes are included in upstream version
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index 607097d..1bdbdbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60180d3f5f467987bfd7bc4505796fae  avrdude-5.5.tar.gz
+d459dcf47fa7fc2a29a70d68ebff4886  avrdude-5.8.tar.gz