diff --git a/avalon-framework-target.patch b/avalon-framework-target.patch
index ed4d97f..2aafea1 100644
--- a/avalon-framework-target.patch
+++ b/avalon-framework-target.patch
@@ -10,3 +10,11 @@
              <classpath refid="project.class.path" />
              <src path="${test.dir}"/>
              <exclude name="org/apache/avalon/framework/logger/LogKit*.java"
+@@ -329,6 +330,7 @@ Legal:
+         <mkdir dir="${target.javadocs}"/>
+ 
+         <javadoc packagenames="org.apache.*"
++            source="1.4"
+             sourcepath="${java.dir}"
+             destdir="${target.javadocs}">
+             <classpath refid="project.class.path" />
diff --git a/avalon-framework.spec b/avalon-framework.spec
index 30643a4..6347dd4 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -116,6 +116,8 @@ cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -155,6 +157,7 @@ fi
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog
 * Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> - 0:4.1.4-2jpp.14