diff --git a/.cvsignore b/.cvsignore
index af6d49c..7788415 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-docbook-utils-0.6.9.tar.gz
-docbook-utils-automake.tar.gz
+docbook-utils-0.6.11.tar.gz
diff --git a/docbook-utils.spec b/docbook-utils.spec
index d5a85cb..c39dc81 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
 Name: docbook-utils
-Version: 0.6.9
-Release: 25
+Version: 0.6.11
+Release: 1
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -19,24 +19,6 @@ BuildArch: noarch
 Source0: %{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
-Source3: docbook-utils-automake.tar.gz
-Patch0: docbook-utils-0.6-..patch
-Patch1: jw-custom.patch
-Patch2: docbook-utils-0.6-@.patch
-Patch3: docbook-utils-0.6-pdf.patch
-Patch4: docbook-utils-0.6.9-nochunks.patch
-Patch5: docbook-utils-0.6.9-txt.patch
-Patch6: docbook-utils-0.6.9--o.patch
-Patch7: docbook-utils-0.6.9-manpage.patch
-Patch8: docbook-utils-0.6.9-sdata.patch
-Patch9: docbook-utils-0.6.9-help.patch
-Patch10: docbook-utils-0.6.9-ol.patch
-Patch11: docbook-utils-0.6.9--V.patch
-Patch12: docbook-utils-0.6.9-sgml_xml.patch
-Patch13: docbook-utils-0.6.9-excl.patch
-Patch14: docbook-utils-0.6.9-link.patch
-Patch15: docbook-utils-0.6.9-pagesize.patch
-Patch16: docbook-utils-0.6.9-texinputs.patch
 
 Obsoletes: stylesheets
 Provides: stylesheets
@@ -62,31 +44,9 @@ PDF format.
 
 %Prep
 %setup -q
-%patch0 -p1 -b ..
-%patch1 -p1 -b .custom
-%patch2 -p1 -b .@
-%patch3 -p1 -b .pdf
-%patch4 -p1 -b .nochunks
-%patch5 -p1 -b .txt
-%patch6 -p1 -b .-o
-%patch7 -p1 -b .manpage
-%patch8 -p1 -b .sdata
-%patch9 -p1 -b .help
-%patch10 -p1 -b .ol
-%patch11 -p1 -b .-V
-%patch12 -p1 -b .sgml_xml
-%patch13 -p1 -b .excl
-%patch14 -p1 -b .link
-%patch15 -p1 -b .pagesize
-%patch16 -p1 -b .texinputs
 
 
 %Build
-
-# Delinkify COPYING
-rm COPYING install-sh missing mkinstalldirs
-tar zxf %{SOURCE3}
-
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
 make
 
@@ -138,6 +98,29 @@ rm -rf $DESTDIR
 %{_bindir}/db2pdf
 
 %changelog
+* Thu Jun 27 2002 Tim Waugh <twaugh@redhat.com> 0.6.11-1
+- 0.6.11.
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.6.10-5
+- automated rebuild
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com> 0.6.10-4
+- automated rebuild
+
+* Mon May 20 2002 Tim Waugh <twaugh@redhat.com> 0.6.10-3
+- Improvements for man page output.
+
+* Fri May  3 2002 Tim Waugh <twaugh@redhat.com> 0.6.10-2
+- Don't define %graphic-default-extension% in the stylesheet---it messes
+  up PS+PDF output from the same source.
+
+* Wed May  1 2002 Tim Waugh <twaugh@redhat.com> 0.6.10-1
+- 0.6.10.
+- No longer need automake files.
+- No longer need '.', jw-custom, '@', pdf, nochunks, txt, '-o', manpage,
+  sdata, help, ol, '-V', sgml_xml, excl, link, pagesize, or texinputs
+  patches.
+
 * Fri Apr 12 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-25
 - Turned off use-id-as-filename in gdp-both.dsl.
 
diff --git a/gdp-both.dsl b/gdp-both.dsl
index 42771d1..2303673 100644
--- a/gdp-both.dsl
+++ b/gdp-both.dsl
@@ -29,6 +29,7 @@
 ;;#                 patched for ADDRESS output (#50605)                 #
 ;;#                      removed comment and remark                     #
 ;;#                      disabled use-id-as-filename                    #
+;;#               don't define %graphic-default-extension%              #
 ;;#######################################################################
 -->
 
@@ -54,10 +55,6 @@
 (define %section-autolabel% 
  #f)
 
-;;What is the default extension for graphics?
-(define %graphic-default-extension% 
-  "eps")
-
 ;;Show URL links? If the text of the link and the URL are identical,
 ;;the parenthetical URL is suppressed.
 (define %show-ulinks%
diff --git a/sources b/sources
index 9fae3fd..862edd6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-09f6a2026fc1380dcd26be6f547497ac  docbook-utils-0.6.9.tar.gz
-b8cad43ed0adf40780077542aa696288  docbook-utils-automake.tar.gz
+e2da71918e7e0555b00f4c4ebb452817  docbook-utils-0.6.11.tar.gz