diff --git a/git-version.sh b/git-version.sh
index 5d8d32e5d..b518cdabd 100755
--- a/git-version.sh
+++ b/git-version.sh
@@ -56,10 +56,12 @@ rev=$(echo "$sha" | sed 's/-g[^-]*$//')
 version="$rev"
 versiond="$rev-systemd"
 
+if false; then
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
     version="$version+"
     versiond="$versiond+"
 fi
+fi
 
 echo "<![ %sysv; ["                                        >  version.ent
 echo "<!ENTITY version           \"$version\">"            >> version.ent
diff --git a/stylesheets/lfs-chunked.xsl b/stylesheets/lfs-chunked.xsl
index 5691f2a50..2c7287765 100644
--- a/stylesheets/lfs-chunked.xsl
+++ b/stylesheets/lfs-chunked.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl
index 171923ef4..118562bd3 100644
--- a/stylesheets/lfs-nochunks.xsl
+++ b/stylesheets/lfs-nochunks.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-pdf.xsl b/stylesheets/lfs-pdf.xsl
index 5565632eb..7db80146f 100644
--- a/stylesheets/lfs-pdf.xsl
+++ b/stylesheets/lfs-pdf.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/chunk-master.xsl b/stylesheets/lfs-xsl/chunk-master.xsl
index cbdf140ae..029332162 100644
--- a/stylesheets/lfs-xsl/chunk-master.xsl
+++ b/stylesheets/lfs-xsl/chunk-master.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/chunk-slave.xsl b/stylesheets/lfs-xsl/chunk-slave.xsl
index 1482ae351..f5bc8a956 100644
--- a/stylesheets/lfs-xsl/chunk-slave.xsl
+++ b/stylesheets/lfs-xsl/chunk-slave.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/chunkfast.xsl b/stylesheets/lfs-xsl/chunkfast.xsl
index 2b79d72ae..6d9d823a5 100644
--- a/stylesheets/lfs-xsl/chunkfast.xsl
+++ b/stylesheets/lfs-xsl/chunkfast.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/common.xsl b/stylesheets/lfs-xsl/common.xsl
index c0414d052..028732d02 100644
--- a/stylesheets/lfs-xsl/common.xsl
+++ b/stylesheets/lfs-xsl/common.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl
index 351c6dbb3..5a5ad36f5 100644
--- a/stylesheets/lfs-xsl/nochunks.xsl
+++ b/stylesheets/lfs-xsl/nochunks.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/pdf/lfs-admon.xsl b/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
index ee9e777e2..cc264ea38 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
index f767ace6a..e5c7ae090 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
index 787a0e8c1..7ec85ddf4 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/stylesheets/lfs-xsl/pdf/lfs-xref.xsl b/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
index ddfe4408b..58dba607e 100644
--- a/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
+++ b/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/stylesheets/lfs-xsl/profile.xsl b/stylesheets/lfs-xsl/profile.xsl
index b89b86cb1..a19d924e9 100644
--- a/stylesheets/lfs-xsl/profile.xsl
+++ b/stylesheets/lfs-xsl/profile.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl b/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
index 99c2fd70c..3726baeb9 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl b/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
index 5c13e2e9c..610e9c53b 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl b/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
index 2e4787633..1e8f17cb0 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
index b0aacec87..cde5f0349 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl b/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
index d9e8c52b3..e22d25423 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
index b3ade8648..36c4ba3fe 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl b/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
index 705793605..aa35e8db6 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl
index f280fb36c..aa8d263c4 100644
--- a/stylesheets/wget-list.xsl
+++ b/stylesheets/wget-list.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
 
 <!-- Create a list of upstream URLs for packages and patches to be used
      with wget. -->