7 files changed, 79 insertions, 4 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 69ee45057..b3b81f95e 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -21,7 +21,7 @@ fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="bootable-disk;bootable-usb;isohybrid-supported;manual-usb-prep-supported"
 frontend="newt;gtk"
-other="supports-wireless;supports-pcmcia;supports-serial-console"
+other="supports-wireless;supports-pcmcia;supports-serial-console;has-bd-iso"
 smp="smp-alternatives"
 goodies="supports-lang-chooser"
 
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 4024917ae..f1df4898e 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -21,7 +21,7 @@ fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="bootable-disk;bootable-usb;isohybrid-supported;manual-usb-prep-supported"
 frontend="newt;gtk"
-other="supports-wireless;supports-pcmcia;supports-serial-console"
+other="supports-wireless;supports-pcmcia;supports-serial-console;has-bd-iso"
 smp="smp-alternatives"
 goodies="supports-lang-chooser"
 
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index 112c7881b..dd3e8d273 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -71,6 +71,7 @@
    <!ENTITY tftp-bootp.xml        SYSTEM "##SRCPATH##/install-methods/tftp/bootp.xml">
    <!ENTITY tftp-dhcp.xml         SYSTEM "##SRCPATH##/install-methods//tftp/dhcp.xml">
   <!ENTITY automatic-install.xml    SYSTEM "##SRCPATH##/install-methods/automatic-install.xml">
+  <!ENTITY verifying-files.xml    SYSTEM "##SRCPATH##/install-methods/verifying-files.xml">
 
 
  <!ENTITY boot-installer.xml      SYSTEM "##SRCPATH##/boot-installer/boot-installer.xml">
diff --git a/debian/changelog b/debian/changelog
index 63ca56d0b..01d269f00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ installation-guide (20200716) UNRELEASED; urgency=medium
   * Some more UEFI updates. Closes: #905173
   * Add some documentation about creation of partition tables, especially gpt.
     Closes: #644430, #691046.
+  * Add chapter about verifying the integrity of installation images.
+    Closes: #975331
 
   [ Updated translations ]
   * Chinese (simplified) by Tao Wang
diff --git a/en/install-methods/downloading-files.xml b/en/install-methods/downloading-files.xml
index ad67f8f16..5ecd45eca 100644
--- a/en/install-methods/downloading-files.xml
+++ b/en/install-methods/downloading-files.xml
@@ -12,10 +12,10 @@ To find the nearest (and thus probably the fastest) mirror, see the
 </para>
 
   <sect2 id="where-files">
-  <title>Where to Find Installation Images</title>
+  <title>Where to Find Installation Files</title>
 
 <para>
-The installation images are located on each &debian; mirror in the directory
+Various installation files can be found on each &debian; mirror in the directory
 <ulink url="&url-debian-installer;images">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink>
 &mdash; the <ulink url="&url-debian-installer;images/MANIFEST">MANIFEST</ulink>
 lists each image and its purpose.
diff --git a/en/install-methods/install-methods.xml b/en/install-methods/install-methods.xml
index 5b4710eac..e387fcb3e 100644
--- a/en/install-methods/install-methods.xml
+++ b/en/install-methods/install-methods.xml
@@ -10,5 +10,6 @@
 &boot-drive-files.xml;
 &install-tftp.xml;
 &automatic-install.xml;
+&verifying-files.xml;
 
 </chapter>
diff --git a/en/install-methods/verifying-files.xml b/en/install-methods/verifying-files.xml
new file mode 100644
index 000000000..9cbffb94f
--- /dev/null
+++ b/en/install-methods/verifying-files.xml
@@ -0,0 +1,71 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id$ -->
+
+ <sect1 id="verifying-files">
+ <title>Verifying the integrity of installation files</title>
+
+<para>
+
+You can verify the integrity of downloaded files against checksums
+provided in <filename>SHA256SUMS</filename> or <filename>SHA512SUMS</filename>
+files on Debian mirrors. You can find them in the same places as the installation images
+itself.
+Visit the following locations:
+
+</para>
+
+<itemizedlist>
+<listitem><para>
+
+<ulink url="https://cdimage.debian.org/debian-cd/current/&architecture;/iso-cd/">checksum
+files for CD images</ulink>,
+
+</para></listitem>
+<listitem><para>
+
+<ulink url="https://cdimage.debian.org/debian-cd/current/&architecture;/iso-dvd/">checksum
+files for DVD images</ulink>,
+
+</para></listitem>
+<listitem condition="has-bd-iso"><para>
+
+<ulink url="https://cdimage.debian.org/debian-cd/current/&architecture;/iso-bd/">checksum
+files for BD images</ulink>,
+
+</para></listitem>
+<listitem><para>
+
+<ulink url="http://http.us.debian.org/debian/dists/&releasename;/main/installer-&architecture;/current/images/">checksum
+files for other installation files</ulink>.
+
+</para></listitem>
+</itemizedlist>
+
+<para>
+
+To compute the checksum of a downloaded installation file, use
+
+<informalexample><screen>
+sha256sum filename.iso
+</screen></informalexample>
+
+respective
+
+<informalexample><screen>
+sha512sum filename.iso
+</screen></informalexample>
+
+and then compare the shown checksum against the corresponding one in the
+<filename>SHA256SUMS</filename> respective <filename>SHA512SUMS</filename> file.
+
+</para><para>
+
+The <ulink url="&url-debian-cd-faq;">Debian CD FAQ</ulink> has
+<ulink url="https://www.debian.org/CD/faq/index.en.html#verify">more useful information</ulink>
+on this topic (such as the script <filename>check_debian_iso</filename>, to semi-automate
+above procedure), as well as instructions, how to verify the integrity of the above checksum
+files themselves.
+
+</para>
+
+ </sect1>