diff --git a/rpm.spec b/rpm.spec
index 4878fc2..eda1cef 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,5 +1,5 @@
 %define	with_python_subpackage	1%{nil}
-%define	with_python_version	2.2%{nil}
+%define	with_python_version	1.5%{nil}
 %define with_perl_subpackage	1
 %define	with_bzip2		1%{nil}
 %define	with_apidocs		1%{nil}
@@ -15,14 +15,15 @@
 %define	__prefix	/usr
 %{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)}
 
-Summary: The Red Hat package management system.
+Summary: The RPM package management system.
 Name: rpm
 %define version 4.0.4
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 7x.4
+Release: 7x.5
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
+Patch: rpm-4.0.4-pyver.patch
 Copyright: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -57,18 +58,18 @@ BuildRoot: %{_tmppath}/%{name}-root
 %description
 The RPM Package Manager (RPM) is a powerful command line driven
 package management system capable of installing, uninstalling,
-verifying, querying, and updating software packages.  Each software
+verifying, querying, and updating software packages. Each software
 package consists of an archive of files along with information about
 the package like its version, a description, etc.
 
 %package devel
-Summary: Development files for applications which will manipulate RPM packages.
+Summary: Development files for manipulating RPM packages.
 Group: Development/Libraries
 Requires: rpm = %{rpm_version}, popt = 1.6.4
 
 %description devel
-This package contains the RPM C library and header files.  These
-development files will simplify the process of writing programs which
+This package contains the RPM C library and header files. These
+development files will simplify the process of writing programs that
 manipulate RPM packages and databases. These files are intended to
 simplify the process of creating graphical package managers or any
 other tools that need an intimate knowledge of RPM packages in order
@@ -84,8 +85,8 @@ Requires: rpm = %{rpm_version}
 Provides: perl(Specfile)
 
 %description build
-This package contains scripts and executable programs that are used to
-build packages using RPM.
+The rpm-build package contains the scripts and executable programs
+that are used to build packages using the RPM Package Manager.
 
 %if %{with_python_subpackage}
 %package python
@@ -96,14 +97,14 @@ Requires: python >= %{with_python_version}
 Requires: popt = 1.6.4
 
 %description python
-The rpm-python package contains a module which permits applications
+The rpm-python package contains a module that permits applications
 written in the Python programming language to use the interface
-supplied by RPM (RPM Package Manager) libraries.
+supplied by the RPM Package Manager libraries.
 
 This package should be installed if you want to develop Python
 programs that will manipulate RPM packages and databases.
-%endif
 
+%endif
 %if %{with_perl_subpackage}
 %package perl
 Summary: Native bindings to the RPM API for Perl.
@@ -130,37 +131,35 @@ implementations.
 
 At this time, the interface only provides access to the database of
 installed packages, and header data retrieval for RPM and SRPM files
-is not yet installed.  Error management and the export of most defined
+is not yet installed. Error management and the export of most defined
 constants, through RPM::Error and RPM::Constants, respectively, are
 also available.
 
 %endif
-
 %package -n popt
 Summary: A C library for parsing command line parameters.
 Group: Development/Libraries
 Version: 1.6.4
 
 %description -n popt
-Popt is a C library for parsing command line parameters.  Popt was
+Popt is a C library for parsing command line parameters. Popt was
 heavily influenced by the getopt() and getopt_long() functions, but it
-improves on them by allowing more powerful argument expansion.  Popt
+improves on them by allowing more powerful argument expansion. Popt
 can parse arbitrary argv[] style arrays and automatically set
-variables based on command line arguments.  Popt allows command line
+variables based on command line arguments. Popt allows command line
 arguments to be aliased via configuration files and includes utility
 functions for parsing arbitrary strings into argv[] arrays using
 shell-like rules.
 
-Install popt if you're a C programmer and you'd like to use its
-capabilities.
-
 %prep
 %setup -q
+%patch -p1
+autoconf
 
 %build
 
 %ifos linux
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man'
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man' --with-python=%{with_python_version}
 %else
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix}
 %endif
@@ -446,8 +445,8 @@ fi
 %rpmattr	%{__prefix}/lib/rpm/Specfile.pm
 
 # XXX remove executable bit to disable autogenerated perl requires for now.
-%rpmattr	%{__prefix}/lib/rpm/perl.req
-#%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/perl.req
+#%rpmattr	%{__prefix}/lib/rpm/perl.req
+%attr(0644, rpm, rpm) %{__prefix}/lib/rpm/perl.req
 
 %rpmattr	%{__prefix}/lib/rpm/rpm[bt]
 %rpmattr	%{__prefix}/lib/rpm/rpmdiff