diff --git a/.cvsignore b/.cvsignore
index db56a4e..2f16016 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpm-4.0.4.tar.gz
+rpm-4.0.5.tar.gz
diff --git a/rpm.spec b/rpm.spec
index 996f006..4c940a6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
 %define	with_python_subpackage	1%{nil}
 %define	with_python_version	1.5%{nil}
-%define with_perl_subpackage	1
+%define with_perl_subpackage	0
 %define	with_bzip2		1%{nil}
 %define	with_apidocs		1%{nil}
 %define with_internal_db	1%{nil}
@@ -17,10 +17,10 @@
 
 Summary: The RPM package management system.
 Name: rpm
-%define version 4.0.4
+%define version 4.0.5
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 7x.26
+Release: 1.7x
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -28,7 +28,7 @@ Conflicts: patch < 2.5
 %ifos linux
 Prereq: gawk fileutils textutils mktemp shadow-utils
 %endif
-Requires: popt = 1.6.4
+Requires: popt = 1.6.5
 
 %if !%{with_internal_db}
 BuildRequires: db3-devel
@@ -64,7 +64,7 @@ the package like its version, a description, etc.
 %package devel
 Summary: Development files for manipulating RPM packages.
 Group: Development/Libraries
-Requires: rpm = %{rpm_version}, popt = 1.6.4
+Requires: rpm = %{rpm_version}, popt = 1.6.5
 
 %description devel
 This package contains the RPM C library and header files. These
@@ -93,7 +93,7 @@ Summary: Python bindings for apps which will manipulate RPM packages.
 Group: Development/Libraries
 Requires: rpm = %{rpm_version}
 Requires: python >= %{with_python_version}
-Requires: popt = 1.6.4
+Requires: popt = 1.6.5
 
 %description python
 The rpm-python package contains a module that permits applications
@@ -113,7 +113,7 @@ Provides: perl(RPM::Database) = %{rpm_version}
 Provides: perl(RPM::Header) = %{rpm_version}
 Requires: rpm = %{rpm_version}
 Requires: perl >= 0:5.00503
-Requires: popt = 1.6.4
+Requires: popt = 1.6.5
 Obsoletes: perl-Perl-RPM
 
 %description perl
@@ -138,7 +138,7 @@ also available.
 %package -n popt
 Summary: A C library for parsing command line parameters.
 Group: Development/Libraries
-Version: 1.6.4
+Version: 1.6.5
 
 %description -n popt
 Popt is a C library for parsing command line parameters. Popt was
@@ -352,6 +352,9 @@ fi
 %rpmattr	%{__prefix}/lib/rpm/rpm.*
 %rpmattr	%{__prefix}/lib/rpm/rpm2cpio.sh
 %rpmattr	%{__prefix}/lib/rpm/rpm[deiukqv]
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_dump
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_load
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_loadcvt
 %attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/rpmpopt*
 %attr(0644, rpm, rpm)	%{__prefix}/lib/rpm/rpmrc
 
@@ -492,6 +495,10 @@ fi
 %{__prefix}/lib/librpmbuild.a
 %{__prefix}/lib/librpmbuild.la
 %{__prefix}/lib/librpmbuild.so
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_deadlock
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_svc
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_stat
+%rpmattr	%{__prefix}/lib/rpm/rpmdb_verify
 
 %files -n popt
 %defattr(-,root,root)
@@ -522,6 +529,15 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Tue Mar 25 2003 Jeff Johnson <jbj@redhat.com> 4.0.5-1
+- bump rpm/popt versions, hardwire 4.0.4 in libraries.
+- link rpm libraries together, move symbols to achieve forward linkage.
+- use db-4.1.25, not db-4.0.14, internally.
+- add rpmdb_loadcvt script, rpmdb_foo utilities.
+- use current autotools,
+- use splint, not lclint.
+- delete rpm-4.1 header-only signatures/digests when signing.
+
 * Tue Nov  5 2002 Jeff Johnson <jbj@redhat.com> 4.0.4-7x.26
 - backport /etc/rpm/platform changes.
 - backport db-4.1.17 changes.
diff --git a/sources b/sources
index bccdbcf..104d4cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a8a12b1450d1505fbd63a51d165dfcf  rpm-4.0.4.tar.gz
+da10efb25b831704bbc279ade2835470  rpm-4.0.5.tar.gz