diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 66e744d..4f24fcd 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -42,15 +42,15 @@ Requires(postun):jpackage-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 # This should go away with F-17
-Provides:       jakarta-commons-logging = 0:%{version}-%{release}
-Obsoletes:      jakarta-commons-logging <= 0:1.0.4
+Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
+Obsoletes:      jakarta-%{short_name} <= 0:1.0.4
 
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
 logging systems. The user can choose at runtime which system they want
 to use. In addition, a small number of basic implementations are
-provided to allow users to use the package standalone. 
+provided to allow users to use the package standalone.
 commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
 commons-logging abstraction is meant to minimize the differences between
 the two, and to allow a developer to not tie himself to a particular
@@ -61,6 +61,7 @@ Summary:        API documentation for %{name}
 Group:          Documentation
 Requires:       jpackage-utils
 
+Obsoletes:      jakarta-%{short_name}-javadoc <= 0:1.0.4
 
 %description    javadoc
 %{summary}.
@@ -149,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
+- Add obsoletes to javadoc subpackage
+
 * Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
 - Fix symlink problems introduced previously in r5