diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 5fd1d17..9b0b013 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -10,11 +10,12 @@
    http://commons.apache.org/commons-build-plugin/
 
 
-VERSION 1.8 - 2017-MM-DD
+VERSION 1.8 - 2018-MM-DD
 ------------------------
 
 Changes since the last release
-1. Fix EOL-style so generate files have correct setting
+1. Fix EOL-style so generated files have correct setting
+2. Change MD5 to SHA1
 
 VERSION 1.7 - 2016-11-18
 ------------------------
diff --git a/src/main/resources/commons-xdoc-templates/download-page-body.xml b/src/main/resources/commons-xdoc-templates/download-page-body.xml
index 250f626..f5144af 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-body.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-body.xml
@@ -3,12 +3,12 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@FINAL_NAME@@BINARY-SUFFIX@.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip">@FINAL_NAME@@BINARY-SUFFIX@.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a></td>
           </tr>
         </table>
@@ -17,12 +17,12 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz">@FINAL_NAME@-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip">@FINAL_NAME@-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.asc">pgp</a></td>
           </tr>
         </table>
diff --git a/src/main/resources/commons-xdoc-templates/download-page-head.xml b/src/main/resources/commons-xdoc-templates/download-page-head.xml
index ee1ff15..e556c26 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-head.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-head.xml
@@ -102,7 +102,7 @@
         It is essential that you
         <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
         of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
-        failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+        failing that using the <code>SHA1</code> hash (<code>*.sha1</code> checksum files).
       </p>
       <p>
         The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
diff --git a/src/site/xdoc/download_commons-build-plugin.xml b/src/site/xdoc/download_commons-build-plugin.xml
index 62b0c6e..0c26fa0 100644
--- a/src/site/xdoc/download_commons-build-plugin.xml
+++ b/src/site/xdoc/download_commons-build-plugin.xml
@@ -100,7 +100,7 @@
         It is essential that you
         <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
         of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
-        failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+        failing that using the <code>SHA1</code> hash (<code>*.sha1</code> checksum files).
       </p>
       <p>
         The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
@@ -114,12 +114,12 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz">commons-build-plugin-1.5-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip">commons-build-plugin-1.5-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/binaries/commons-build-plugin-1.5-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
@@ -128,12 +128,12 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz">commons-build-plugin-1.5-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip">commons-build-plugin-1.5-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip.sha1">sha1</a></td>
               <td><a href="https://www.apache.org/dist/commons/commons-build-plugin/source/commons-build-plugin-1.5-src.zip.asc">pgp</a></td>
           </tr>
         </table>