diff --git a/rpm-python.spec b/rpm-python.spec
index c1f7880..c553d6b 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        88
+Release:        94
 Requires:       rpm = %{version}
 
 %py_requires
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libdir}/python*
 
-%changelog -n rpm-python
+%changelog
 * Wed Oct 18 2006 - mls@suse.de
 - use rpm.spec for building instead of duplication everything
 - delete superfluous .a and .la files [#202604]
diff --git a/rpm-suse_macros b/rpm-suse_macros
index 12d409f..92bc572 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -451,8 +451,8 @@
 
 
 %do_profiling 1
-%cflags_profile_generate -fprofile-arcs
-%cflags_profile_feedback -fbranch-probabilities
+%cflags_profile_generate -fprofile-generate
+%cflags_profile_feedback -fprofile-use
 
 # find-supplements.ksyms parses this macro directly out of the spec file:
 %supplements_kernel_module() \
diff --git a/rpm.changes b/rpm.changes
index cd451e8..e0e0233 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  6 20:19:40 CET 2007 - rguenther@suse.de
+
+- adjust cflags_profile_generate and cflags_profile_feedback to
+  enable tree profiling
+
 -------------------------------------------------------------------
 Fri Jan 26 16:55:15 CET 2007 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 938635f..3c1c50c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq popt = %{popt_version} permission
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        82
+Release:        87
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -314,7 +314,7 @@ Summary:        A C library for parsing command line parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        310
+Release:        315
 #
 
 %description -n popt
@@ -337,7 +337,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Version:        1.7
-Release:        310
+Release:        315
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -374,7 +374,10 @@ Authors:
         %{_libdir}/libpopt.so
 %doc	%{_mandir}/man3/popt.3*
 
-%changelog -n rpm
+%changelog
+* Tue Mar 06 2007 - rguenther@suse.de
+- adjust cflags_profile_generate and cflags_profile_feedback to
+  enable tree profiling
 * Fri Jan 26 2007 - mls@suse.de
 - create /var/spool/repackage directory [#230866]
 - do not run pre/posttrans scripts in test mode [#235361]