diff --git a/xalan-j2.spec b/xalan-j2.spec
index 0335e6d..78e6552 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_5fc
+Release:        5jpp.1
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -58,6 +58,8 @@ BuildArch:      noarch
 Provides:       jaxp_transform_impl
 Requires:       jaxp_parser_impl
 Requires:	/usr/sbin/update-alternatives
+Requires(post):		/usr/sbin/update-alternatives
+Requires(preun):	/usr/sbin/update-alternatives
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:	java-devel
 BuildRequires:  ant
@@ -113,7 +115,9 @@ Documentation for %{name}.
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):		coreutils
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
@@ -251,6 +255,11 @@ fi
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %post xsltc
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -326,6 +335,11 @@ fi
 %endif
 
 %changelog
+* Thu Aug 10 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:2.7.0-5jpp.1
+- Resync with latest from JPP.
+- Partially adopt new naming convention (.1 suffix).
+- Use ln and rm explicitly instead of core-utils in Requires(x).
+
 * Thu Aug 10 2006 Karsten Hopp <karsten@redhat.de> 2.7.0-4jpp_5fc
 - Requires(post):     coreutils
 
@@ -556,4 +570,3 @@ fi
 * Wed Aug 08 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2.D6-1mdk
 - first Mandrake release
 
-