diff --git a/ChangeLog b/ChangeLog
index ce15148b6202b62a0647d0a74ad10cd50cc56187..cb25e8ba6327374a8836f9c2416e9f05718257c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-03 Niels Möller <nisse@lysator.liu.se>
+
+ * doc/lsh.texinfo: Updated charset declaration.
+
2011-11-24 Niels Möller <nisse@lysator.liu.se>
* misc/run-tests (test_program): If EMULATOR is set in the
diff --git a/doc/lsh.texinfo b/doc/lsh.texinfo
index 5c955ac2196b7f20e00afbd13e77cc85241566a2..32e8f44f73c7095785c1b38e29e749a33b4511e6 100644
--- a/doc/lsh.texinfo
+++ b/doc/lsh.texinfo
@@ -5,7 +5,7 @@
@settitle lsh
@c %**end of header
-@documentencoding ISO-8859-1
+@documentencoding UTF-8
@dircategory GNU Packages
@direntry
diff --git a/nettle/ChangeLog b/nettle/ChangeLog
index 4ab659cba85a7e6ce15ba6938949e22712b5ebfb..8b0ec24adc653204aca447e6e32854c9a9d5f20a 100644
--- a/nettle/ChangeLog
+++ b/nettle/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-03 Niels Möller <nisse@lysator.liu.se>
+
+ * nettle.texinfo: Updated charset declaration.
+ * misc/plan.html: Likewise.
+
2012-01-17 Niels Möller <nisse@lysator.liu.se>
* testsuite/Makefile.in (DISTFILES): Added setup-env.
diff --git a/nettle/misc/plan.html b/nettle/misc/plan.html
index 5f8d359b062c1dc5de38efec0e625bec8beb51a5..217e0aa502c28a23c537b47fdcfd7021e336c8fa 100644
--- a/nettle/misc/plan.html
+++ b/nettle/misc/plan.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" title="Default"
type="text/css" href="todo.css" media="all"/>
<meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1"/>
+ content="text/html; charset=utf-8"/>
<title>TODO for the nettle-2.2 release</title>
</head>
<body>
diff --git a/nettle/nettle.texinfo b/nettle/nettle.texinfo
index 3dfc7eb20b4d693cd83292d9c5affaf14f008341..7cf1555052643c0ae110495786f23b824d71781d 100644
--- a/nettle/nettle.texinfo
+++ b/nettle/nettle.texinfo
@@ -2,7 +2,7 @@
@c %**start of header
@setfilename nettle.info
@settitle Nettle: a low-level cryptographic library
-@documentencoding ISO-8859-1
+@documentencoding UTF-8
@footnotestyle separate
@syncodeindex fn cp
@c %**end of header