diff --git a/content/_layouts/default.html b/content/_layouts/default.html
index 87fe1e9..cc20b54 100644
--- a/content/_layouts/default.html
+++ b/content/_layouts/default.html
@@ -34,7 +34,7 @@
                     <li class="sidebar-header">Apache PDFBox</li>
                     <li><a href="/index.html">Overview</a></li>
                     <li><a href="https://www.apache.org/licenses">License</a></li>
-                    <li><a href="/download.cgi">Download</a></li>
+                    <li><a href="/download.html">Download</a></li>
 
                     <li class="sidebar-header">Community</li>
                     <li><a href="/support.html">Support</a></li>
diff --git a/content/download.cgi b/content/download.cgi
deleted file mode 100755
index 06a42f2..0000000
--- a/content/download.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Wrapper script around mirrors.cgi script
-# (we must change to that directory in order for python to pick up the
-#  python includes correctly)
-cd /www/www.apache.org/dyn/mirrors
-/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
diff --git a/content/download.html b/content/download.html
index 04c0bef..5c7c95c 100644
--- a/content/download.html
+++ b/content/download.html
@@ -37,23 +37,6 @@
 
 <h2>Current releases</h2>
 
-<a name="mirror"></a>
-<h3>Mirrors</h3>
-
-
-[if-any logo] []([link]) [end] Your current mirror is
-<code>[preferred]</code>. If you encounter a problem with this mirror, please select another. If all mirrors are failing, try
-the *backup* mirrors at the end of the mirrors list, which should be available.
-Alternatively, <a href="https://www.apache.org/mirrors/">view the complete list of mirrors</a>.
-
-<form action="/download.cgi" method="get" id="SelectMirror">Mirrors:
-  <select name="Preferred">[if-any http] [for http]
-  <option value="[http]">[http]</option>[end] [end] [if-any ftp] [for ftp]
-  <option value="[ftp]">[ftp]</option>[end] [end] [if-any backup] [for backup]
-  <option value="[backup]">[backup] (backup)</option>[end] [end]</select>
-  <input type="submit" value="Change"></input>
-</form>
-
 <h3>Binary Distribution</h3>
 
 <table class="table">
@@ -73,19 +56,19 @@
         </tr>
         <tr>
             <td>PDFBox standalone</td>
-            <td><a href="[preferred]pdfbox/2.0.21/pdfbox-app-2.0.21.jar">pdfbox-app-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/pdfbox-app-2.0.21.jar&action=download">pdfbox-app-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-app-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-app-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>Debugger standalone</td>
-            <td><a href="[preferred]pdfbox/2.0.21/debugger-app-2.0.21.jar">debugger-app-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/debugger-app-2.0.21.jar&action=download">debugger-app-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/debugger-app-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/debugger-app-2.0.21.jar.sha512">SHA512</a></td>        
         </tr>
         <tr>
             <td>Preflight standalone</td>
-            <td><a href="[preferred]pdfbox/2.0.21/preflight-app-2.0.21.jar">preflight-app-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/preflight-app-2.0.21.jar&action=download">preflight-app-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/preflight-app-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/preflight-app-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
@@ -94,37 +77,37 @@
         </tr>
         <tr>
             <td>pdfbox</td>
-            <td><a href="[preferred]pdfbox/2.0.21/pdfbox-2.0.21.jar">pdfbox-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/pdfbox-2.0.21.jar&action=download">pdfbox-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>fontbox</td>
-            <td><a href="[preferred]pdfbox/2.0.21/fontbox-2.0.21.jar">fontbox-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/fontbox-2.0.21.jar&action=download">fontbox-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/fontbox-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/fontbox-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>preflight</td>
-            <td><a href="[preferred]pdfbox/2.0.21/preflight-2.0.21.jar">preflight-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/preflight-2.0.21.jar&action=download">preflight-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/preflight-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/preflight-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>xmpbox</td>
-            <td><a href="[preferred]pdfbox/2.0.21/xmpbox-2.0.21.jar">xmpbox-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/xmpbox-2.0.21.jar&action=download">xmpbox-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/xmpbox-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/xmpbox-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>pdfbox-tools</td>
-            <td><a href="[preferred]pdfbox/2.0.21/pdfbox-tools-2.0.21.jar">pdfbox-tools-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/pdfbox-tools-2.0.21.jar&action=download">pdfbox-tools-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-tools-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-tools-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>pdfbox-debugger</td>
-            <td><a href="[preferred]pdfbox/2.0.21/pdfbox-debugger-2.0.21.jar">pdfbox-debugger-2.0.21.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/pdfbox-debugger-2.0.21.jar&action=download">pdfbox-debugger-2.0.21.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-debugger-2.0.21.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-debugger-2.0.21.jar.sha512">SHA512</a></td>
         </tr>
@@ -136,13 +119,13 @@
         </tr>
         <tr>
             <td>PDFBox standalone</td>
-            <td><a href="[preferred]pdfbox/1.8.16/pdfbox-app-1.8.16.jar">pdfbox-app-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/pdfbox-app-1.8.16.jar&action=download">pdfbox-app-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-app-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-app-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>Preflight standalone</td>
-            <td><a href="[preferred]pdfbox/1.8.16/preflight-app-1.8.16.jar">preflight-app-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/preflight-app-1.8.16.jar&action=download">preflight-app-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/preflight-app-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/preflight-app-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
@@ -151,31 +134,31 @@
         </tr>
         <tr>
             <td>pdfbox</td>
-            <td><a href="[preferred]pdfbox/1.8.16/pdfbox-1.8.16.jar">pdfbox-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/pdfbox-1.8.16.jar&action=download">pdfbox-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>fontbox</td>
-            <td><a href="[preferred]pdfbox/1.8.16/fontbox-1.8.16.jar">fontbox-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/fontbox-1.8.16.jar&action=download">fontbox-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/fontbox-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/fontbox-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>preflight</td>
-            <td><a href="[preferred]pdfbox/1.8.16/preflight-1.8.16.jar">preflight-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/preflight-1.8.16.jar&action=download">preflight-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/preflight-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/preflight-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>jempbox</td>
-            <td><a href="[preferred]pdfbox/1.8.16/jempbox-1.8.16.jar">jempbox-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/jempbox-1.8.16.jar&action=download">jempbox-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/jempbox-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/jempbox-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td>xmpbox</td>
-            <td><a href="[preferred]pdfbox/1.8.16/xmpbox-1.8.16.jar">xmpbox-1.8.16.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/xmpbox-1.8.16.jar&action=download">xmpbox-1.8.16.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/xmpbox-1.8.16.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/xmpbox-1.8.16.jar.sha512">SHA512</a></td>
         </tr>
@@ -184,7 +167,7 @@
         <tr>
             <td rowspan="1"><strong>JBIG2<br>3.0.3</strong><br><small>feature</small></td>
             <td>JBIG2 ImageIO plugin</td>
-            <td><a href="[preferred]pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3.jar">jbig2-imageio-3.0.3.jar</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3.jar&action=download">jbig2-imageio-3.0.3.jar</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3.jar.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3.jar.sha512">SHA512</a></td>
         </tr>
@@ -207,21 +190,21 @@
         <tr>
             <td><strong>PDFBox<br>2.0.21</strong><br><small>feature</small></td>
             <td>Source ZIP file incl. examples</td>
-            <td><a href="[preferred]pdfbox/2.0.21/pdfbox-2.0.21-src.zip">pdfbox-2.0.21-src.zip</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/2.0.21/pdfbox-2.0.21-src.zip&action=download">pdfbox-2.0.21-src.zip</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-2.0.21-src.zip.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/2.0.21/pdfbox-2.0.21-src.zip.sha512">SHA512</a></td>
         </tr>
         <tr>
             <td><strong>PDFBox<br>1.8.16</strong><br><small>bugfix</small></td>
             <td>Source ZIP file incl. examples</td>
-            <td><a href="[preferred]pdfbox/1.8.16/pdfbox-1.8.16-src.zip">pdfbox-1.8.16-src.zip</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/1.8.16/pdfbox-1.8.16-src.zip&action=download">pdfbox-1.8.16-src.zip</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-1.8.16-src.zip.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/1.8.16/pdfbox-1.8.16-src.zip.sha512">SHA512</a></td>  
         </tr>
         <tr>
             <td><strong>JBIG2<br>3.0.3</strong><br><small>feature</small></td>
             <td>Source ZIP file</td>
-            <td><a href="[preferred]pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip">jbig2-imageio-3.0.3-src.zip</a></td>
+            <td><a href="https://www.apache.org/dyn/closer.lua?filename=pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip&action=download">jbig2-imageio-3.0.3-src.zip</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip.asc">ASC</a></td>
             <td><a href="https://www.apache.org/dist/pdfbox/jbig2-imageio/3.0.3/jbig2-imageio-3.0.3-src.zip.sha512">SHA512</a></td>
         </tr>