diff --git a/.cvsignore b/.cvsignore
index 991d0d0..5ad5bd7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amanda-2.5.0p2.tar.gz
+amanda-2.5.0p2-nosst.tar.gz
diff --git a/amanda.spec b/amanda.spec
index 47c2c6e..9c8028d 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -11,10 +11,12 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.5.0p2
-Release: 3
-Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
+Release: 3.5
+#Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
+# This is the upstream tarball with the problematic contrib/sst directory
+# removed.
+Source: amanda-%{version}-nosst.tar.gz
 Source1: amanda.crontab
-# Source2: __README_QUICKSETUP__
 Source4: disklist
 Source5: amanda-xinetd
 Source6: amandaidx-xinetd
@@ -26,6 +28,9 @@ 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
+Patch6: amanda-2.5.0p2-dump_size.patch
+Patch7: amanda-2.5.0p2-new_gnutar.patch
+Patch8: amanda-2.5.0p2-wildcards.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -91,6 +96,9 @@ be used to develop amanda applications.
 %patch3 -p1 -b .error_msg
 %patch4 -p1 -b .restore
 %patch5 -p1 -b .big_holding_disk
+%patch6 -p1 -b .dump_size
+%patch7 -p1 -b .new_gnutar
+%patch8 -p1 -b .wildcards
 
 libtoolize --copy --force
 aclocal
@@ -115,7 +123,8 @@ export SED=sed
 	--with-group=%amanda_group \
 	--with-tmpdir=/var/log/amanda \
 	--with-gnutar=/bin/tar \
-	--with-ssh-security
+	--with-ssh-security \
+
 	
 make %{?_smp_mflags}
 (cd common-src; make security)
@@ -144,12 +153,10 @@ cp example/* examples
 rm -f examples/Makefile*
 rm -f examples/config.site
 
-#cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir}
 pushd tape-src/.libs
 install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
 popd
 
-# cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/
 rm -r ${RPM_BUILD_ROOT}%{_libdir}/amanda/dumperdir
 rmdir --ignore-fail-on-non-empty ${RPM_BUILD_ROOT}%{_libdir}/amanda
 
@@ -164,12 +171,6 @@ pushd ${RPM_BUILD_ROOT}
   mkdir -p .%{_localstatedir}/amanda/gnutar-lists
   mkdir -p .%{_localstatedir}/amanda/%defconfig/index
 
-#  for i in libamanda libamtape libamclient libamserver ; do
-#    mv .%{_libdir}/${i}.so .%{_libdir}/${i}-%{version}-19991216-beta1.so
-#    mv .%{_libdir}/${i}.la .%{_libdir}/${i}-%{version}-19991216-beta1.la
-#    mv .%{_libdir}/${i}.a .%{_libdir}/${i}-%{version}-19991216-beta1.a
-#  done
-
   chmod 755 .%{_libdir}/libam*
 popd
 cp examples/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig}
@@ -348,6 +349,17 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %{_libdir}/librestore.so
 
 %changelog
+* Mon Sep 25 2006 Jay Fenlason <fenlason@redhat.com> 2.5.0p2-4
+- Include my -dump_size patch to close
+  bz#206129: Dump output size determined incorrectly
+- Clean up the spec file, following some suggestions in
+  bz#185659: amanda 2.5.0
+- Use a tarball without the problematic contrib/sst directory.
+- Include my new_gnutar (based on a patch by Orion Poplawski
+  <orion@cora.nwra.com>) to work around changed incremental file format
+  in newer (>1.15.1) versions of gnutar.
+- include my -wildcards patch to turn on wildcards with new versions of tar.
+
 * Tue Sep 5 2006 Jay Fenlason <fenlason@redhat.com> 2.5.0p2-3
 - move libamclient-*.so to the base rpm, so that multilib support works.
   This fixes
diff --git a/fix-amanda-tarball.sh b/fix-amanda-tarball.sh
new file mode 100755
index 0000000..8d9b25c
--- /dev/null
+++ b/fix-amanda-tarball.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -e
+#
+#  See http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
+#
+
+tmppath=`mktemp -d ${TMPDIR:-/tmp}/fix-amanda-tarball-XXXXXX`
+if test -z "$tmppath" ; then
+	echo Error creating temporary directory.
+	exit 1
+fi
+trap "rm -fr $tmppath" EXIT
+
+initialdir=`pwd`
+
+for tarball in ${initialdir}/amanda-*.tar.{gz,bz2} ; do
+	if ! test -s "$tarball" ; then
+		continue
+	fi
+	rm -fr $tmppath/*
+	pushd $tmppath > /dev/null
+	case "$tarball" in
+	*nosst*)
+		: Do nothing.
+		;;
+	*.gz)
+		gzip  -dc "$tarball" | tar xf -
+		rm -fr amanda*/contrib/sst
+		tar cf - * | gzip  -9c > \
+		$initialdir/`basename $tarball .tar.gz`-nosst.tar.gz
+		;;
+	*.bz2)
+		bzip2 -dc "$tarball" | tar xf -
+		rm -fr amanda*/contrib/sst
+		tar cf - * | bzip2 -9c > \
+		$initialdir/`basename $tarball .tar.bz2`-nosst.tar.bz2
+		;;
+	esac
+	popd > /dev/null
+done
diff --git a/sources b/sources
index a2fb350..5275c93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-073828b8b5a5c377a08f8f19b5eccf85  amanda-2.5.0p2.tar.gz
+b3da48d99f63ebc1814683fd1276b996  amanda-2.5.0p2-nosst.tar.gz