diff --git a/.cvsignore b/.cvsignore
index 4289282..5fef66b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-valgrind-3.1.0.tar.bz2
+valgrind-3.1.1.tar.bz2
diff --git a/sources b/sources
index 7a1c4de..3c776b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d92156e9172dc6097e56c69ea9c88013  valgrind-3.1.0.tar.bz2
+3bbfafedb59c19bf75977381ce2eb6d7  valgrind-3.1.1.tar.bz2
diff --git a/valgrind.spec b/valgrind.spec
index 6b3bdcd..f284d85 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,14 +1,13 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
-Version: 3.1.0
-Release: 2
+Version: 3.1.1
+Release: 1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.1.0-valgrind_h.patch
-Patch2: valgrind-3.1.0-amd64-highbase.patch
-Patch3: valgrind-3.1.0-amd64-speedup.patch
-Patch4: valgrind-3.1.0-cfa-val-expr.patch
-Patch5: valgrind-3.1.0-glibc24.patch
+Patch1: valgrind-3.1.1-valgrind_h.patch
+Patch2: valgrind-3.1.1-amd64-speedup.patch
+Patch3: valgrind-3.1.1-cfa-val-expr.patch
+Patch4: valgrind-3.1.1-glibc24.patch
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -32,12 +31,9 @@ find/diagnose.
 %prep
 %setup -q
 %patch1 -p1
-%ifarch x86_64
-#%patch2 -p1
-%endif
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %ifarch x86_64
@@ -115,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Mon Apr  3 2006 Jakub Jelinek <jakub@redhat.com> 3.1.1-1
+- upgrade to 3.1.1
+  - many bugfixes
+
 * Mon Mar 13 2006 Jakub Jelinek <jakub@redhat.com> 3.1.0-2
 - add support for DW_CFA_val_offset{,_sf}, DW_CFA_def_cfa_sf
   and skip over DW_CFA_val_expression quietly