diff -Nru xemacs21-21.4.24/debian/changelog xemacs21-21.4.24/debian/changelog
--- xemacs21-21.4.24/debian/changelog	2019-09-05 11:16:39.000000000 +0000
+++ xemacs21-21.4.24/debian/changelog	2020-02-24 23:09:41.000000000 +0000
@@ -1,8 +1,11 @@
-xemacs21 (21.4.24-8build1) eoan; urgency=medium
+xemacs21 (21.4.24-9) unstable; urgency=low
 
-  * No-change upload with strops.h and sys/strops.h removed in glibc.
+  * Fix corruption in ldap.texi (closes: #952371).
+  * Add some @documentencoding tags in texinfo to deal with
+    fragility in new texinfo versions.
+  * Policy 4.5.0 (no changes).
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 11:16:39 +0000
+ -- Mark Brown <broonie@debian.org>  Mon, 24 Feb 2020 23:09:41 +0000
 
 xemacs21 (21.4.24-8) unstable; urgency=medium
 
diff -Nru xemacs21-21.4.24/debian/control xemacs21-21.4.24/debian/control
--- xemacs21-21.4.24/debian/control	2018-08-26 13:36:51.000000000 +0000
+++ xemacs21-21.4.24/debian/control	2020-02-24 23:09:41.000000000 +0000
@@ -2,7 +2,7 @@
 Section: editors
 Priority: optional
 Maintainer: Mark Brown <broonie@debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 4.5.0
 Homepage: http://www.xemacs.org/
 Build-Depends: autotools-dev, texinfo, libcanna1g-dev, libwnn6-dev, libjpeg-dev, libncurses5-dev, libpng-dev, libtiff5-dev, zlib1g-dev, texi2html, debhelper (>> 5.0.0), libldap2-dev, libdb-dev, libpam0g-dev, libcompfaceg1-dev, libx11-dev, libxau-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, xbitmaps, xcursor-themes, libxaw7-dev, autoconf2.13, libgpm-dev [linux-any]
 
diff -Nru xemacs21-21.4.24/debian/patches/document-encoding xemacs21-21.4.24/debian/patches/document-encoding
--- xemacs21-21.4.24/debian/patches/document-encoding	1970-01-01 00:00:00.000000000 +0000
+++ xemacs21-21.4.24/debian/patches/document-encoding	2020-02-24 23:09:41.000000000 +0000
@@ -0,0 +1,9 @@
+--- a/man/xemacs-faq.texi	2015-03-25 11:25:33.000000000 +0000
++++ b/man/xemacs-faq.texi	2020-02-25 00:32:10.749227930 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo.tex      @c -*- mode: texinfo; coding: iso-2022-8 -*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename ../info/xemacs-faq.info
+ @settitle Frequently asked questions about XEmacs
+ @setchapternewpage off
diff -Nru xemacs21-21.4.24/debian/patches/ldap xemacs21-21.4.24/debian/patches/ldap
--- xemacs21-21.4.24/debian/patches/ldap	1970-01-01 00:00:00.000000000 +0000
+++ xemacs21-21.4.24/debian/patches/ldap	2020-02-24 23:09:41.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/man/lispref/ldap.texi	2020-02-24 23:27:05.832359638 +0000
++++ b/man/lispref/ldap.texi	2020-02-24 23:35:22.139146972 +0000
+@@ -105,7 +105,7 @@
+ library XEmacs was compiled with, they may include @code{simple},
+ @code{krbv41} and @code{krbv42}.
+ @item base
+-The base for the search. This may look like @samp{cÿ, o¬me}, see
++The base for the search. This may look like @samp{o=ACME, c=US}, see
+ RFC 1779 for syntax details.
+ @item scope
+ One of the symbols @code{base}, @code{onelevel} or @code{subtree}
diff -Nru xemacs21-21.4.24/debian/patches/series xemacs21-21.4.24/debian/patches/series
--- xemacs21-21.4.24/debian/patches/series	2019-02-04 11:02:19.000000000 +0000
+++ xemacs21-21.4.24/debian/patches/series	2020-02-24 23:09:41.000000000 +0000
@@ -3,3 +3,5 @@
 11_CVE-2010-0825.dpatch
 emacsen-common
 fix-hppa-build.patch
+ldap
+document-encoding