diff --git a/concurrent.spec b/concurrent.spec
index 4e19fb7..0c319af 100644
--- a/concurrent.spec
+++ b/concurrent.spec
@@ -36,7 +36,7 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_55555fc
+Release:        4jpp.1
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -67,6 +67,8 @@ Concurrent Programming in Java.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -104,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -135,6 +141,11 @@ fi
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-4jpp.1
+- Merge with upstream version:
+ - Add missing requires for javadoc task
+ - Add missing postun for javadoc task
+
 * Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp-5fc
 - Rebuilt