diff --git a/jakarta-commons-beanutils.spec b/jakarta-commons-beanutils.spec
index 4e60d80..d2b6aac 100644
--- a/jakarta-commons-beanutils.spec
+++ b/jakarta-commons-beanutils.spec
@@ -42,14 +42,13 @@ Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
 Group:		Development/Libraries/Java
-Vendor:         JPackage Project
-Distribution:   JPackage
 Source0:	http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz
 Url:		http://jakarta.apache.org/commons/%{base_name}/
 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
 %if ! %{gcj_support}
@@ -74,6 +73,7 @@ is very lightweight.
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -149,6 +149,9 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 14 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-4jpp_1rh
+- Merge with upstream
+
 * Fri Jul 14 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-4jpp
 - Add AOT bits
 
@@ -156,9 +159,42 @@ fi
 - Add header
 - Remove unecessary macro definitions
 
+* Mon Mar  6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.7.0-2jpp_6fc
+- stop scriptlet spew
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 
+- bump again for double-long bug on ppc(64)
+
+* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.7.0-2jpp_4fc
+- rebuilt again
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.7.0-2jpp_3fc
+- rebuilt
+
+* Tue Jul 19 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-2jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Wed May 25 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-2jpp_1fc
+- Upgrade to 1.7.0-2jpp.
+- Rearrange how BC-compiled stuff is built and installed.
+
+* Mon May 23 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-1jpp_4fc
+- Add alpha to the list of build architectures (#157522).
+- Use absolute paths for rebuild-gcj-db.
+
+* Thu May  5 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-1jpp_3fc
+- Add dependencies for %post and %postun scriptlets (#156901).
+
+* Wed May  4 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-1jpp_2fc
+- BC-compile.
+
 * Sat Jan 29 2005 Ralph Apel <r.apel@r-apel.de> - 0:1.7.0-2jpp
 - Use the "dist" target to get a full build, including bean-collections
 
+* Thu Jan 20 2005 Gary Benson <gbenson@redhat.com> - 0:1.7.0-1jpp_1fc
+- Build into Fedora.
+
 * Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp
 - Upgrade to 1.7.0