diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..2e87827
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+popt
diff --git a/rpm-python.spec b/rpm-python.spec
index 63fcc24..e4efb5d 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -17,7 +17,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        228
+Release:        229
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec
diff --git a/rpm.changes b/rpm.changes
index ea2f495..79fea82 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Apr 10 12:50:33 CEST 2008 - ro@suse.de
+
+- added baselibs.conf file for xxbit packages 
+
+-------------------------------------------------------------------
+Thu Apr 10 12:32:46 CEST 2008 - jw@suse.de
+
+- added whatrequires-doc.diff
+  Adds a hint to the misleading --whatrequires option, pointing to
+  the more useful -e --test.  
+  Motivated by a talk thread started by Hubert.
+
 -------------------------------------------------------------------
 Wed Apr  9 23:15:48 CEST 2008 - mrueckert@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 26dbceb..d67ddca 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        186
+Release:        187
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -133,6 +133,7 @@ Patch103:       noautoreloc.diff
 Patch104:       lzma-payload.diff
 Patch105:       lzma-payload-2.diff
 Patch106:       debugsource-package.diff
+Patch107:       whatrequires-doc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -208,6 +209,7 @@ rm -f rpmdb/db.h
 %patch -P 100 -P 101 -P 102 -P 103
 %patch -P 104 -P 105 -b .lzma
 %patch106 -p1
+%patch107 -p1
 chmod 755 scripts/find-supplements{,.ksyms}
 chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 tar -xjvf %{SOURCE1}
@@ -352,7 +354,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        414
+Release:        415
 #
 
 %description -n popt
@@ -375,7 +377,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        414
+Release:        415
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -410,6 +412,13 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Thu Apr 10 2008 ro@suse.de
+- added baselibs.conf file for xxbit packages
+* Thu Apr 10 2008 jw@suse.de
+- added whatrequires-doc.diff
+  Adds a hint to the misleading --whatrequires option, pointing to
+  the more useful -e --test.
+  Motivated by a talk thread started by Hubert.
 * Thu Apr 10 2008 mrueckert@suse.de
 - revert the last change as it leads to duplicated entries in the
   file list
diff --git a/whatrequires-doc.diff b/whatrequires-doc.diff
new file mode 100644
index 0000000..ab8ce03
--- /dev/null
+++ b/whatrequires-doc.diff
@@ -0,0 +1,14 @@
+--- rpm-4.4.2/doc/rpm.8.orig	2008-04-10 12:02:59.000000000 +0200
++++ rpm-4.4.2/doc/rpm.8	2008-04-10 12:30:16.923076000 +0200
+@@ -584,6 +584,11 @@
+ .TP
+ \fB--whatrequires \fICAPABILITY\fB\fR
+ Query all packages that requires \fICAPABILITY\fR for proper functioning.
++.br
++Note that this does not return what requires a given package.
++A package usually provides multiple capabilities and file-names on which 
++other packages may depend. To see the complete dependencies
++for a package, use \fB-e --test \fIPACKAGE_NAME\fB\fR
+ .SS "PACKAGE QUERY OPTIONS:"
+ .PP
+ .TP