diff --git a/.gitignore b/.gitignore
index 63b91f4..7be1f41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-rubberband-1.5.0.tar.bz2
+/rubberband-1.6.0.tar.bz2
diff --git a/rubberband-1.5.0-fix_ver.patch b/rubberband-1.5.0-fix_ver.patch
deleted file mode 100644
index dc835d7..0000000
--- a/rubberband-1.5.0-fix_ver.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rubberband-1.5.0/rubberband.pc.in.fix_ver	2010-05-02 21:06:05.000000000 +0200
-+++ rubberband-1.5.0/rubberband.pc.in	2010-07-03 20:01:01.396222596 +0200
-@@ -4,7 +4,7 @@
- includedir=${prefix}/include
- 
- Name: rubberband
--Version: 1.4.0
-+Version: 1.5.0
- Description: 
- Libs: -L${libdir} -lrubberband
- Cflags: -I${includedir} 
---- rubberband-1.5.0/configure.ac.fix_ver	2010-05-02 21:06:05.000000000 +0200
-+++ rubberband-1.5.0/configure.ac	2010-07-03 20:02:24.968410068 +0200
-@@ -1,5 +1,5 @@
- 
--AC_INIT(RubberBand, 1.2, cannam@all-day-breakfast.com)
-+AC_INIT(RubberBand, 1.5, cannam@all-day-breakfast.com)
- 
- AC_CONFIG_SRCDIR(src/StretcherImpl.h)
- AC_PROG_CXX
diff --git a/rubberband-1.5.0-gcc44.patch b/rubberband-1.5.0-gcc44.patch
deleted file mode 100644
index 336df54..0000000
--- a/rubberband-1.5.0-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp.gcc44 rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp
---- rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp.gcc44	2010-06-02 09:21:14.510350757 -0400
-+++ rubberband-1.5.0/vamp/RubberBandVampPlugin.cpp	2010-06-02 09:21:25.649356553 -0400
-@@ -18,6 +18,7 @@
- #include "system/sysutils.h"
- 
- #include <cmath>
-+#include <cstdio>
- 
- using std::string;
- using std::vector;
diff --git a/rubberband-1.6.0-fix_ver.patch b/rubberband-1.6.0-fix_ver.patch
new file mode 100644
index 0000000..920d6b5
--- /dev/null
+++ b/rubberband-1.6.0-fix_ver.patch
@@ -0,0 +1,11 @@
+--- rubberband-1.6.0/rubberband.pc.in.fix_ver	2011-03-19 16:01:07.000000000 +0100
++++ rubberband-1.6.0/rubberband.pc.in	2011-07-14 15:47:48.049514847 +0200
+@@ -4,7 +4,7 @@
+ includedir=${prefix}/include
+ 
+ Name: rubberband
+-Version: 1.4.0
++Version: 1.6.0
+ Description: 
+ Libs: -L${libdir} -lrubberband
+ Cflags: -I${includedir} 
diff --git a/rubberband-1.6.0-gcc46.patch b/rubberband-1.6.0-gcc46.patch
new file mode 100644
index 0000000..c7a96aa
--- /dev/null
+++ b/rubberband-1.6.0-gcc46.patch
@@ -0,0 +1,10 @@
+--- rubberband-1.6.0/rubberband/RubberBandStretcher.h.gcc46	2011-03-19 16:01:07.000000000 +0100
++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h	2011-07-14 15:29:29.756201539 +0200
+@@ -21,6 +21,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <cstddef>
+ 
+ /**
+  * @mainpage RubberBand
diff --git a/rubberband.spec b/rubberband.spec
index 7a1a54b..06696b2 100644
--- a/rubberband.spec
+++ b/rubberband.spec
@@ -1,18 +1,18 @@
 Name:           rubberband
-Version:        1.5.0
-Release:        3%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Audio time-stretching and pitch-shifting library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.breakfastquay.com/rubberband/
-Source0:        http://code.breakfastquay.com/attachments/download/1/rubberband-1.5.0.tar.bz2
-Patch0:         %{name}-1.5.0-gcc44.patch
+Source0:        http://code.breakfastquay.com/attachments/download/16/rubberband-%{version}.tar.bz2
+Patch0:         %{name}-1.6.0-gcc46.patch
 Patch1:         %{name}-1.5.0-mk.patch
 # incorrect version in configure.ac (harmless) and .pc.in (could be bad
 # if a consumer strictly requires 1.5.0 functionality);
 # e-mailed to author
-Patch2:		%{name}-1.5.0-fix_ver.patch
+Patch2:		%{name}-1.6.0-fix_ver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fftw-devel libsamplerate-devel libsndfile-devel
@@ -37,9 +37,10 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc44
+%patch0 -p1 -b .gcc46
 %patch1 -p1 -b .mk
 %patch2 -p1 -b .fix_ver
+sed -i 's|{exec_prefix}/lib|{exec_prefix}/%{_lib}|' rubberband.pc.in
 
 
 %build
@@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 14 2011 Michel Salim <salimma@fedoraproject.org> - 1.6.0-1
+- Update to 1.6.0
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b3227f1..9681ed3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5f288d644fcd46bd159e187bcc33f25  rubberband-1.5.0.tar.bz2
+28e3dc1f5ae694d6846bcb0ef3d597fc  rubberband-1.6.0.tar.bz2