diff --git a/rpm-python.spec b/rpm-python.spec
index 96ceb33..2020997 100644
--- a/rpm-python.spec
+++ b/rpm-python.spec
@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        145
+Release:        148
 Requires:       rpm = %{version}
 
 %py_requires
diff --git a/rpm-suse_macros b/rpm-suse_macros
index a8e2538..1599467 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -459,11 +459,11 @@
 	%{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
 
 # Template for lang sub-package.
-%lang_package \
-%package lang\
-Summary: Languages for package %{name}\
-Group: System/Localization\
-Requires: %{name} = %{version}\
-%description lang\
-Provides translations to the package %{name}.
-
+%lang_package(n:) \
+%package %{-n:-n %{-n*}-}lang \
+Summary: Languages for package %{name} \
+Group: System/Localization \
+Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
+Requires: %{name} = %{version} \
+%description %{-n:-n %{-n*}-}lang \
+Provides translations to the package %{name}
diff --git a/rpm.changes b/rpm.changes
index 8344dbb..bd7efb5 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug  8 23:25:56 CEST 2007 - dmueller@suse.de
+
+- support optional -n parameter in %lang_package
+- make %lang_package export a -all provides that
+  can be used to resolve conflicts with the bundle
+
 -------------------------------------------------------------------
 Thu Aug  2 15:28:09 CEST 2007 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 5b4a986..09c0d80 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 Autoreqprov:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        126
+Release:        128
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -340,7 +340,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        354
+Release:        356
 #
 
 %description -n popt
@@ -363,7 +363,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        354
+Release:        356
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -399,6 +399,10 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Wed Aug 08 2007 - dmueller@suse.de
+- support optional -n parameter in %%lang_package
+- make %%lang_package export a -all provides that
+  can be used to resolve conflicts with the bundle
 * Thu Aug 02 2007 - mls@suse.de
 - let the debug_package_requires macro overwrite the
   default requires in the debuginfo package