diff --git a/jakarta-commons-beanutils.spec b/jakarta-commons-beanutils.spec
index e97e57e..060334d 100644
--- a/jakarta-commons-beanutils.spec
+++ b/jakarta-commons-beanutils.spec
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.7.0
-%define release		1jpp
+%define release		1jpp_1rh
 %define	section		free
 
 Name:		%{name}
@@ -20,6 +20,8 @@ BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 0:2.0
 BuildRequires:	jakarta-commons-logging >= 0:1.0
 BuildRequires:	jpackage-utils > 0:1.5
+BuildRequires:  coreutils
+
 Requires:	jakarta-commons-collections >= 0:2.0
 Requires:	jakarta-commons-logging >= 0:1.0
 BuildArch:	noarch
@@ -64,6 +66,16 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+rm -f %{_javadir}/%{short_name}*.jar
+rm -f %{_javadir}/%{name}*.jar
+
+%triggerpostun -- commons-beanutils < 1.7
+pushd %{_javadir} &> /dev/null
+    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
+    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
+popd &> /dev/null
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -83,12 +95,34 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp_1rh
+- Import from upstream
+
 * Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp
 - Upgrade to 1.7.0
 
+* Fri Oct 1 2004 Andrew Overholt <overholt@redhat.com> 0:1.6.1-4jpp_6rh
+- add coreutils BuildRequires
+
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-5jpp
 - Rebuild with ant-1.6.2
 
+* Fri Jul 2 2004 Aizaz Ahmed <aahmed@redhat.com> 0:1.6.1-4jpp_5rh
+- Added trigger to restore symlinks that are removed if ugrading
+  from a commons-beanutils rhug package
+
+* Fri Apr  2 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_4rh
+- more of the same, for version-suffixed .jar files
+
+* Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_3rh
+- add RHUG upgrade cleanup
+
+* Fri Mar  5 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_2rh
+- RH vacuuming part II
+
+* Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_1rh
+- RH vacuuming
+
 * Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:1.6.1-4jpp
 - update for JPackage 1.5