diff --git a/.cvsignore b/.cvsignore
index da64af7..991d0d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amanda-2.5.0.tar.gz
+amanda-2.5.0p2.tar.gz
diff --git a/amanda.spec b/amanda.spec
index d218140..829e8fa 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,8 +10,8 @@
 
 Summary: A network-capable tape backup solution.
 Name: amanda
-Version: 2.5.0
-Release: 3
+Version: 2.5.0p2
+Release: 2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -22,13 +22,16 @@ Source7: amidxtape-xinetd
 Source8: amandahosts
 Patch0: amanda-2.4.2-bug18322.patch
 Patch1: amanda-2.5.0-pie.patch
-Patch2: amanda-2.5.0-overflow.patch
+Patch2: amanda-2.5.0-amcheck_badtape.patch
+Patch3: amanda-2.5.0p2-error_msg.patch
+Patch4: amanda-2.5.0p2-restore.patch
+Patch5: amanda-2.5.0p2-big_holding_disk.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
 Prereq: fileutils grep initscripts
-BuildRequires: dump gnuplot cups samba-client tar grep fileutils mailx
-BuildRequires: libtool automake autoconf gcc-c++ readline-devel
+BuildRequires: dump gnuplot cups samba-client tar grep fileutils
+BuildRequires: libtool automake autoconf gcc-c++ readline-devel /usr/bin/Mail
 Requires: tar /usr/bin/Mail
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -84,7 +87,11 @@ be used to develop amanda applications.
 %setup -q
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
-%patch2 -p1 -b .overflow
+%patch2 -p1 -b .amcheck_badtape
+%patch3 -p1 -b .error_msg
+%patch4 -p1 -b .restore
+%patch5 -p1 -b .big_holding_disk
+
 libtoolize --copy --force
 aclocal
 automake
@@ -341,6 +348,21 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %{_libdir}/librestore.so
 
 %changelog
+* Thu Jun 8 2006 Jay Fenlason <fenlason@redhat.com> 2.5.0p2-2
+- New upstream version
+- Make the BuildRequires on /usr/bin/Mail rather than mailx, because we
+  don't really care where the Mail command comes from.
+- include the amcheck_badtape patch by Paul Bijnens
+  <paul.bijnens@xplanation.com> to fix a problem where amcheck doesn't
+  realize the wrong tape is in the drive.
+- include the error_msg patch from Jean-Louis Martineau <martineau@zmanda.com>
+  to fix a double-free problem
+- include the restore patch from Jean-Louis Martineau <martineau@zmanda.com>
+  to fix an error in amrestore
+- include a slightly modified form of the big_holding_disk patch from
+  Andrej Filipcic <andrej.filipcic@ijs.si> to fix a problem with holding
+  disks bigger than 4tb
+
 * Mon May 22 2006 Jesse Keating <jkeating@redhat.com> 2.5.0-3
 - Fix BuildReqs
 
diff --git a/sources b/sources
index 57df901..a2fb350 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a720dafd60ff215dd97aa3271d7e0051  amanda-2.5.0.tar.gz
+073828b8b5a5c377a08f8f19b5eccf85  amanda-2.5.0p2.tar.gz