diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec
index b9cb590..d9db026 100644
--- a/jakarta-commons-modeler.spec
+++ b/jakarta-commons-modeler.spec
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release		3jpp_4fc
+%define release		4jpp_0fc
 %define	section		free
 
 Name:		%{name}
@@ -56,17 +56,14 @@ Group:		Development/Documentation
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -n %{short_name}-%{version}-src
-#%patch
+#%%patch
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-
 export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-
-ant dist
+%ant dist
 
 aot-compile \
     dist/%{short_name}.jar \
@@ -75,13 +72,14 @@ aot-compile \
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+%__mkdir_p %{buildroot}%{_javadir}
+%__cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed  "s|jakarta-||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed  "s|-%{version}||g"`; done)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
 # solibs
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
 install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
@@ -95,7 +93,7 @@ gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
   %{_libdir}/lib%{name}-%{version}.jar.so
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 %pre
 rm -f %{_javadir}/%{short_name}*.jar
@@ -113,21 +111,29 @@ popd &> /dev/null
 %postun
 /usr/bin/rebuild-gcj-db %{_libdir}
 
+%post javadoc
+%__rm -f %{_javadocdir}/%{name}
+%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ $1 -eq 0 ]; then
+  %__rm -f %{_javadocdir}/%{name}
+fi
+
 %files
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
 %{_javadir}/*
 %attr(0755,root,root) %{_libdir}/lib*.jar.so
 %{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
+%defattr(0644,root,root,0755)
+%dir %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}/*
+%ghost %dir %{_javadocdir}/%{name}
 
 %changelog
-* Wed May 25 2005 Gary Benson <gbenson@redhat.com>
-- Add missing epochs to dependencies.
-
 * Mon May 23 2005 Gary Benson <gbenson@redhat.com> - 0:1.1-3jpp_4fc
 - Add alpha to the list of build architectures (#157522).
 - Use absolute paths for rebuild-gcj-db.
@@ -141,6 +147,11 @@ popd &> /dev/null
 * Mon Mar  7 2005 Gary Benson <gbenson@redhat.com> - 0:1.1-3jpp_1fc
 - Build into Fedora.
 
+* Thu Feb 24 2005 David Walluck <david@jpackage.org> 0:1.1-4jpp
+- add missing epochs to dependencies
+- add non-versioned javadoc symlink
+- fix file permissions
+
 * Fri Oct 22 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.1-3jpp_1rh
 - Merge with upstream version