diff --git a/.cvsignore b/.cvsignore
index c30fa94..9018816 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-docbook-xsl-1.50.0.tar.gz
+docbook-xsl-1.58.1.tar.gz
diff --git a/docbook-style-xsl.Makefile b/docbook-style-xsl.Makefile
new file mode 100644
index 0000000..49c6c21
--- /dev/null
+++ b/docbook-style-xsl.Makefile
@@ -0,0 +1,41 @@
+BINDIR = /usr/bin
+DESTDIR = ..overridden in spec file..
+
+all: install
+
+install: install-xsl install-img install-extensions install-misc
+
+install-xsl:
+	mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling}
+	cp common/*.dtd $(DESTDIR)/common
+	cp common/*.xml $(DESTDIR)/common
+	cp common/*.xsl $(DESTDIR)/common
+	cp fo/*.xml $(DESTDIR)/fo
+	cp fo/*.xsl $(DESTDIR)/fo
+	cp html/*.xml $(DESTDIR)/html
+	cp html/*.xsl $(DESTDIR)/html
+	cp htmlhelp/*.xml $(DESTDIR)/htmlhelp
+	cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
+#	cp htmlhelp/doc/*.xml $(DESTDIR)/htmlhelp/doc
+	cp javahelp/*.xsl $(DESTDIR)/javahelp
+	cp lib/lib.xsl $(DESTDIR)/lib
+	cp template/README $(DESTDIR)/template
+	cp template/*.xml $(DESTDIR)/template
+	cp template/*.xsl $(DESTDIR)/template
+	cp xhtml/*.xsl $(DESTDIR)/xhtml
+	cp manpages/README $(DESTDIR)/manpages
+	cp manpages/*.xsl $(DESTDIR)/manpages
+	cp profiling/*.xsl $(DESTDIR)/profiling
+
+install-img:
+	mkdir -p $(DESTDIR)/images/callouts
+	cp images/*.gif $(DESTDIR)/images
+	cp images/*.png $(DESTDIR)/images
+	cp images/callouts/*.png $(DESTDIR)/images/callouts
+
+install-extensions:
+	mkdir -p $(DESTDIR)/extensions
+	cp -r extensions/* $(DESTDIR)/extensions
+
+install-misc:
+	cp VERSION $(DESTDIR)
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index a622645..4b625ce 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.50.0
-Release: 3
+Version: 1.58.1
+Release: 2
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -12,14 +12,14 @@ Provides: docbook-xsl = %{version}
 PreReq: docbook-dtd-xml
 # xml-common was using /usr/share/xml until 0.6.3-8.
 PreReq: xml-common >= 0.6.3-8
-# PassiveTeX before 1.11 can't handle the new master-* stuff.
-Conflicts: passivetex < 1.11
+# PassiveTeX before 1.21 can't handle the newer stylesheets.
+Conflicts: passivetex < 1.21
 
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
 BuildArch: noarch
 Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
-Source1: %{name}-%{version}.Makefile
+Source1: %{name}.Makefile
 
 
 %description
@@ -84,6 +84,24 @@ CATALOG=/etc/xml/catalog
 
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Mon Dec  2 2002 Tim Waugh <twaugh@redhat.com> 1.58.1-1
+- 1.58.1.
+- No longer need marker patch.
+
+* Mon Nov  4 2002 Tim Waugh <twaugh@redhat.com> 1.57.0-2
+- Ship profiling directory (bug #77191).
+
+* Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 1.57.0-1
+- 1.57.0.
+
+* Wed Oct 16 2002 Tim Waugh <twaugh@redhat.com> 1.56.1-1
+- 1.56.1.
+- Use value-of not copy-of for fo:marker content.
+- Conflict with passivetex < 1.21.
+
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 
diff --git a/sources b/sources
index 76e495e..5330c2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99bd3978b3882faa7aace5731254ba7f  docbook-xsl-1.50.0.tar.gz
+ae692e69175afb86bc4ac1772f079655  docbook-xsl-1.58.1.tar.gz