diff --git a/openjade.spec b/openjade.spec
index bf92beb..dcedd42 100644
--- a/openjade.spec
+++ b/openjade.spec
@@ -1,13 +1,15 @@
-Summary: A parser and tools for SGML plus DSSSL.
+Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3
-Release: 7
-Prereq: sgml-common
+Release: 13
+Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-1.3-decl.patch
 Patch1: openjade-1.3-strdup.patch
 # compiler bug. remove later.
 Patch2: openjade-foo.patch
+Patch3: openjade-1.3-size_t.patch
+Patch4: openjade-1.3-31525.patch
 Copyright: Copyright 1997 James Clark
 Group: Applications/Text
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
@@ -16,14 +18,23 @@ Obsoletes: jade
 Provides: jade
 
 %description
-Jade (James' DSSSL Engine) is an implementation of the DSSSL style
-language.
+OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL
+(Document Style Semantics and Specification Language).  OpenJade is
+based on James Clark's Jade implementation of DSSSL. OpenJade is a
+commmand line application and a set of components.  The DSSSL engine
+inputs an SGML or XML document and can output a variety of formats:
+XML, RTF, TeX, MIF (FrameMaker), SGML or XML.
+
 
 %prep
 %setup -q
 %patch0 -p1 -b .decl
 %patch1 -p1 -b .strdup
 %patch2 -p1 -b .foo
+%ifarch s390 s390x
+%patch3 -p1 -b .size_t
+%endif
+%patch4 -p1 -b .31525
 
 %build
 
@@ -35,8 +46,9 @@ export CXXFLAGS="-O0"
 export CXXFLAGS="-O0"
 %endif
 %configure --prefix=%{prefix} --enable-static \
- --enable-default-catalog=%{prefix}/lib/sgml/CATALOG \
- --datadir=%{prefix}/lib/sgml
+ --enable-default-catalog=/etc/sgml/catalog \
+ --enable-default-search-path=/usr/share/sgml \
+ --datadir=/usr/share/sgml/%{name}-%{version}
 NRPROC=`egrep -c "^cpu[0-9]+" /proc/stat || :`
 [ "$NRPROC" = "0" ] && NRPROC=1
 make -j$NRPROC
@@ -52,9 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT
 mkdir -p \
- $RPM_BUILD_ROOT/%{prefix}/{bin,doc,lib/sgml,include/sp/{generic,include,lib}}
+ $RPM_BUILD_ROOT/%{prefix}/{lib,bin,doc,share/sgml/openjade-1.3,include/sp/{generic,include,lib}}
 
-%makeinstall datadir=$RPM_BUILD_ROOT/%{prefix}/lib/sgml
+%makeinstall datadir=$RPM_BUILD_ROOT/%{prefix}/share/sgml/openjade-1.3
 
 # oMy, othis ois osilly.
 ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade
@@ -67,38 +79,51 @@ install generic/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/generic/
 install include/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/include/
 install lib/*.h $RPM_BUILD_ROOT/%{prefix}/include/sp/lib/
 # install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade 
-strip $RPM_BUILD_ROOT/%{prefix}/bin/jade 
-strip $RPM_BUILD_ROOT/%{prefix}/bin/nsgmls   
-strip $RPM_BUILD_ROOT/%{prefix}/bin/spam     
-strip $RPM_BUILD_ROOT/%{prefix}/bin/sgmlnorm 
-strip $RPM_BUILD_ROOT/%{prefix}/bin/spent    
-cp dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/lib/sgml/dsssl.cat
+cp dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/
 cp dsssl/dsssl.dtd dsssl/style-sheet.dtd dsssl/fot.dtd \
-  $RPM_BUILD_ROOT/%{prefix}/lib/sgml/
-
-find $RPM_BUILD_ROOT -type f -exec strip --strip-unneeded {} \;
+  $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-# since old-postun is run *after* new-post, we must always cycle.
-V=%{version}-%{release}
-%{prefix}/bin/install-catalog --install dsssl --version $V >/dev/null
-
-%postun
-# since old-postun is run *after* new-post, we must always cycle.
-V=%{version}-%{release}
-%{prefix}/bin/install-catalog --remove dsssl --version $V >/dev/null
-
 %files
 %defattr(-,root,root)
 %doc doc/ jadedoc/ dsssl/ pubtext/ unicode/ README COPYING VERSION
 %{prefix}/bin/*
 %{prefix}/lib/*
+%{prefix}/share/sgml
 %{prefix}/include/*
 
 %changelog
+* Tue Mar 13 2001 Tim Waugh <twaugh@redhat.com>
+- Avoid creating bogus TeX output for section headings containing
+  special characters (#bug 31525).
+
+* Mon Jan 22 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- Apply original autoconf patch to s390 s390x only. This patch can
+  be deleted once s390* uses a current compiler.
+
+* Thu Jan 19 2001 Tim Waugh <twaugh@redhat.com>
+- Don't conflict with stylesheets; require sgml-common >= 0.5 instead.
+- Revert autoconf change, as it's still broken.
+
+* Wed Jan 17 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- fix this autoconf macro to work on all archs :-)
+
+* Wed Jan 17 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- apply patch from Fritz Elfert <felfert@to.com>
+	- removed explicit stripping
+	- Added autoconf macro for correctly recognizing if size_t
+	  is unsigned int
+
+* Tue Jan 16 2001 Tim Waugh <twaugh@redhat.com>
+- Default catalog file is /etc/sgml/catalog.
+
+* Mon Jan 08 2001 Tim Waugh <twaugh@redhat.com>
+- Conflict with stylesheets (new-trials location changes).
+- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}.
+- Remove %%post and %%postun.
+
 * Wed Oct 18 2000 Matt Wilson <msw@redhat.com>
 - rebuilt against g++-2.96-60, fixes jade on alpha