diff --git a/rpm-4.4.2.1-rc1-poptver.patch b/rpm-4.4.2.1-rc1-poptver.patch
new file mode 100644
index 0000000..2c6c95c
--- /dev/null
+++ b/rpm-4.4.2.1-rc1-poptver.patch
@@ -0,0 +1,24 @@
+diff -up rpm-4.4.2.1-rc1/popt/configure.poptver rpm-4.4.2.1-rc1/popt/configure
+--- rpm-4.4.2.1-rc1/popt/configure.poptver	2007-06-26 13:51:35.000000000 +0300
++++ rpm-4.4.2.1-rc1/popt/configure	2007-06-26 13:51:45.000000000 +0300
+@@ -2418,7 +2418,7 @@ fi
+ 
+ # Define the identity of the package.
+  PACKAGE=popt
+- VERSION=1.10.2
++ VERSION=1.10.2.1
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -up rpm-4.4.2.1-rc1/popt/configure.ac.poptver rpm-4.4.2.1-rc1/popt/configure.ac
+--- rpm-4.4.2.1-rc1/popt/configure.ac.poptver	2007-06-26 13:51:29.000000000 +0300
++++ rpm-4.4.2.1-rc1/popt/configure.ac	2007-06-26 13:51:40.000000000 +0300
+@@ -2,7 +2,7 @@ AC_INIT(popt.h)
+ AC_CANONICAL_SYSTEM
+ AC_PREREQ(2.12)
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE(popt, 1.10.2)
++AM_INIT_AUTOMAKE(popt, 1.10.2.1)
+ 
+ ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
+ 
diff --git a/rpm.spec b/rpm.spec
index dd21e22..b7a9d0c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -14,7 +14,7 @@ Summary: The RPM package management system
 Name: rpm
 Version: 4.4.2.1
 %{expand: %%define rpm_version %{version}-rc1}
-Release: 0.1.rc1
+Release: 0.2.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source: rpm-%{rpm_version}.tar.gz
@@ -24,11 +24,12 @@ 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
 License: GPL
 Requires(pre): shadow-utils
 Requires(postun): shadow-utils
 Requires(post): coreutils
-Requires: popt = 1.10.2
+Requires: popt = 1.10.2.1
 Requires: crontabs
 
 BuildRequires: autoconf
@@ -113,8 +114,7 @@ programs that will manipulate RPM packages and databases.
 %package -n popt
 Summary: A C library for parsing command line parameters
 Group: Development/Libraries
-Version: 1.10.2
-Release: 48%{?dist}
+Version: 1.10.2.1
 
 %description -n popt
 Popt is a C library for parsing command line parameters. Popt was
@@ -134,6 +134,7 @@ shell-like rules.
 %patch4 -p1 -b .develdeps
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
+%patch7 -p1 -b .poptver
 
 %build
 
@@ -428,6 +429,10 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Tue Jun 26 2007 Panu Matilainen <pmatilai@redhat.com> 4.4.2.1-0.2.rc1
+- patch popt version to 1.10.2.1 for clean upgrade path
+- popt release follows main package release again
+
 * Mon Jun 25 2007 Panu Matilainen <pmatilai@redhat.com> 4.4.2.1-0.1.rc1
 - update to 4.4.2.1-rc1
 - patch shuffle, most have been merged upstream