diff --git a/xmlto-0.0.18-xsltopts.diff b/xmlto-0.0.18-xsltopts.diff
new file mode 100644
index 0000000..5110435
--- /dev/null
+++ b/xmlto-0.0.18-xsltopts.diff
@@ -0,0 +1,32 @@
+--- xmlto-0.0.18/xmlto.in.~1~	2004-01-02 13:03:24.000000000 +0100
++++ xmlto-0.0.18/xmlto.in	2007-12-12 15:39:19.000000000 +0100
+@@ -37,6 +37,7 @@
+   -o directory    put output in the specified directory instead of
+                   the current working directory
+   -p postprocopts pass option to postprocessor
++  --xsltopts      use xsltproc command line options
+   --extensions    turn on stylesheet extensions for this tool chain
+   --searchpath    colon-separated list of fallback directories
+   --skip-validation
+@@ -156,7 +157,7 @@
+ 
+ # Process any options
+ ARGS=$(${GETOPT} \
+-	--longoptions=help,version,extensions,searchpath:,skip-validation \
++	--longoptions=help,version,extensions,searchpath:,skip-validation,xsltopts: \
+ 	-n xmlto -- x:m:o:p:v "$@")
+ [ $? != 0 ] && { usage; exit 1; }
+ eval set -- "$ARGS"
+@@ -222,6 +223,10 @@
+ 	SKIP_VALIDATION=1
+ 	shift
+ 	;;
++  --xsltopts)
++      XSLTOPTS="$XSLTOPTS $2"
++      shift 2
++      ;;
+   --)
+ 	shift
+ 	break
+
+Diff finished.  Wed Dec 12 15:39:29 2007
diff --git a/xmlto-README.SuSE b/xmlto-README.SuSE
index 5746e59..ac94a86 100644
--- a/xmlto-README.SuSE
+++ b/xmlto-README.SuSE
@@ -12,3 +12,12 @@ problems within this tool chain, try another FO processor like "fop".
 2. Run "fop" on the .fo file:
 
    fop file.fo
+
+
+Specifying HTML output encoding
+===============================
+
+Make use of the --xsltopts switch to specify the HTML output encoding:
+
+   xmlto --xsltopts '--stringparam chunker.output.encoding "ISO-8859-1"' \
+         html file.xml
diff --git a/xmlto.changes b/xmlto.changes
index d692b62..17a882e 100644
--- a/xmlto.changes
+++ b/xmlto.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 12 16:21:14 CET 2007 - ke@suse.de
+
+- Cleanup spec file.
+- Apply xmlto-0.0.18-xsltopts.diff to provide a command line switch for
+  specifying the HTML output encoding; see # 197484 (thanks to Thomas
+  Schraitle).
+
 -------------------------------------------------------------------
 Mon Aug 28 11:37:03 CEST 2006 - ke@suse.de
 
diff --git a/xmlto.spec b/xmlto.spec
index 9a22879..d5cedc4 100644
--- a/xmlto.spec
+++ b/xmlto.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlto (Version 0.0.18)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,21 +14,23 @@ Name:           xmlto
 BuildRequires:  docbook-xsl-stylesheets libxslt sgml-skel
 Summary:        Tool for Converting XML Files to Various Formats
 Version:        0.0.18
-Release:        43
-License:        GPL
+Release:        119
+License:        GPL v2 or later
 Group:          Productivity/Publishing/XML
-URL:            http://cyberelk.net/tim/xmlto/
+Url:            http://cyberelk.net/tim/xmlto/
 Source0:        ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 Source10:       %{name}-README.SuSE
 Patch:          xmlto-nonvoid.patch
 Patch1:         xmlto-0.0.18-overflow.patch
 Patch2:         xmlto-find-cmd.diff
+Patch3:         xmlto-0.0.18-xsltopts.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # We rely entirely on the DocBook XSL stylesheets!
 Requires:       docbook-xsl-stylesheets >= 1.56.0
 # For full functionality, we need passivetex.
 Requires:       passivetex >= 1.11
-Requires:       libxslt
+Requires:       /usr/bin/xsltproc
+Requires:       /usr/bin/xmllint
 Requires:       docbook_4
 
 %description
@@ -41,12 +43,14 @@ for print output it makes use of passivetex.
 %prep
 %setup -q
 %patch
-%patch -p 1 -P 1 -p 1 -P 2
+%patch -p 1 -P 1 -p 1 -P 2 -p 1 -P 3
 cp %{S:10} README.SuSE
 
 %build
 %configure
 make
+
+%check
 make check
 
 %install
@@ -65,7 +69,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 %{_datadir}/xmlto
 
-%changelog -n xmlto
+%changelog
+* Wed Dec 12 2007 - ke@suse.de
+- Cleanup spec file.
+- Apply xmlto-0.0.18-xsltopts.diff to provide a command line switch for
+  specifying the HTML output encoding; see # 197484 (thanks to Thomas
+  Schraitle).
 * Mon Aug 28 2006 - ke@suse.de
 - Fix find argument sequence; reported by Marcus Rueckert [#201749].
 * Wed Jan 25 2006 - mls@suse.de