diff --git a/.cvsignore b/.cvsignore
index 01240df..ecc35f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ rpm-4.3.3.tar.gz
 rpm-4.4.1.tar.gz
 rpm-4.4.2.tar.gz
 rpm-4.4.2.1-rc1.tar.gz
+rpm-4.4.2.1-rc2.tar.gz
diff --git a/rpm.spec b/rpm.spec
index bd48497..42ffef1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -13,8 +13,8 @@
 Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.1
-%{expand: %%define rpm_version %{version}-rc1}
-Release: 0.3.rc1
+%{expand: %%define rpm_version %{version}-rc2}
+Release: 0.4.rc2
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -24,8 +24,6 @@ Patch3: rpm-4.4.2-trust.patch
 Patch4: rpm-4.4.2-devel-autodep.patch
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2-matchpathcon.patch
-Patch7: rpm-4.4.2.1-rc1-poptver.patch
-Patch8: rpm-4.4.2.1-rc1-query-iterators.patch
 License: GPL
 Requires(pre): shadow-utils
 Requires(postun): shadow-utils
@@ -135,8 +133,6 @@ shell-like rules.
 %patch4 -p1 -b .develdeps
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
-%patch7 -p1 -b .poptver
-%patch8 -p1 -b .queryiter
 
 %build
 
@@ -357,8 +353,10 @@ exit 0
 %{__prefix}/src/redhat/RPMS/*
 %rpmattr        %{__bindir}/rpmbuild
 %rpmattr        %{__prefix}/lib/rpm/brp-*
+%rpmattr        %{__prefix}/lib/rpm/check-buildroot
 %rpmattr        %{__prefix}/lib/rpm/check-files
 %rpmattr        %{__prefix}/lib/rpm/check-prereqs
+%rpmattr        %{__prefix}/lib/rpm/check-rpaths*
 %attr(0644, rpm, rpm) %{__prefix}/lib/rpm/config.site
 %rpmattr        %{__prefix}/lib/rpm/cross-build
 %rpmattr        %{__prefix}/lib/rpm/debugedit
@@ -431,6 +429,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jul 04 2007 Panu Matilainen <pmatilai@redhat.com> 4.4.2.1-0.4.rc2
+- 4.4.2.1-rc2
+
 * Thu Jun 28 2007 Panu Matilainen <pmatilai@redhat.com> 4.4.2.1-0.3.rc1
 - don't hang because of leftover query iterators (#246044)
 
diff --git a/sources b/sources
index 74b365f..8ac292c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 e24ce468082479fe850c9d6563f56db5  rpm-4.4.2.tar.gz
 70d4172ec53e94b13b11960bb65e0773  rpm-4.4.2.1-rc1.tar.gz
+1aa73bfb923356fe80863dd4a913c8d2  rpm-4.4.2.1-rc2.tar.gz