diff --git a/.cvsignore b/.cvsignore
index 7788415..a94ff96 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-docbook-utils-0.6.11.tar.gz
+docbook-utils-0.6.12.tar.gz
diff --git a/docbook-utils.spec b/docbook-utils.spec
index f56a977..d3c65c0 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
 Name: docbook-utils
-Version: 0.6.11
-Release: 2
+Version: 0.6.12
+Release: 5
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -14,11 +14,13 @@ Requires: perl-SGMLSpm >= 1.03ii
 Requires: which
 
 BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: perl-SGMLSpm
 
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
+Patch0: docbook-utils-fixes.patch
 
 Obsoletes: stylesheets
 Provides: stylesheets
@@ -45,6 +47,8 @@ PDF format.
 %Prep
 %setup -q
 
+# Fixes from CVS
+%patch0 -p1
 
 %Build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
@@ -54,7 +58,7 @@ make
 %Install
 export DESTDIR=$RPM_BUILD_ROOT
 rm -rf $DESTDIR
-make install prefix=%{_prefix} mandir=%{_mandir} docdir=$DESTDIR%{_docdir}
+make install prefix=%{_prefix} mandir=%{_mandir} docdir=/tmp
 for util in dvi html pdf ps rtf
 do
 	ln -s docbook2$util $RPM_BUILD_ROOT%{_bindir}/db2$util
@@ -64,8 +68,8 @@ done
 rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
 install -c -m 775 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
 install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils.dsl
-install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
-perl -pi -e 's/^ "USletter"/ "A4"/' $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
+
+rm -rf $RPM_BUILD_ROOT/tmp
 
 %Clean
 DESTDIR=$RPM_BUILD_ROOT
@@ -98,6 +102,22 @@ rm -rf $DESTDIR
 %{_bindir}/db2pdf
 
 %changelog
+* Wed Feb  5 2003 Tim Waugh <twaugh@redhat.com> 0.6.12-5
+- Build requires perl-SGMLSpm (bug #83474).
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 0.6.12-4
+- rebuilt
+
+* Mon Jan 13 2003 Tim Waugh <twaugh@redhat.com> 0.6.12-3
+- Fixes from CVS.
+
+* Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 0.6.12-2
+- No longer need separate stylesheet for A4.
+- Don't install files not packaged.
+
+* Wed Oct 16 2002 Tim Waugh <twaugh@redhat.com> 0.6.12-1
+- 0.6.12.
+
 * Thu Jun 27 2002 Tim Waugh <twaugh@redhat.com> 0.6.11-2
 - 0.6.11.
 
diff --git a/sources b/sources
index 9871f27..090b12d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c2b2ddd207c5ce75a8039d977115a03  docbook-utils-0.6.11.tar.gz
+e8541700e40e661ee3048617ec53dccf  docbook-utils-0.6.12.tar.gz