diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py
index 7d40a4f6..f01e58b6 100644
--- a/i2p2www/downloads.py
+++ b/i2p2www/downloads.py
@@ -72,6 +72,10 @@ def downloads_redirect(version, protocol, domain, file):
if domain:
if not domain in mirrors:
abort(404)
- return redirect(mirrors[domain]['url'] % data)
+ return render_template('downloads/redirect.html',
+ version=version, protocol=protocol, domain=domain, file=file,
+ url=mirrors[domain]['url'] % data)
randomain = mirrors.keys()[randint(0, len(mirrors) - 1)]
- return redirect(mirrors[randomain]['url'] % data)
+ return render_template('downloads/redirect.html',
+ version=version, protocol=protocol, domain=domain, file=file,
+ url=mirrors[randomain]['url'] % data)
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index ae955db7..24dd90cc 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -180,42 +180,7 @@ The files are signed by zzz,
I2P can also be downloaded from our project pages on Launchpad and Google Code.
{%- endtrans %}
-{{ _('Post-install work') }}
-
-{% trans -%}
-After running the installer on windows, simply click on the "Start I2P" button
-which will bring up the router console,
-which has further instructions.
-{%- endtrans %}
-
-{% trans -%}
-On Unix-like systems, I2P can be started as a service
-using the "i2prouter" script, located in the directory you selected for I2P.
-Changing to that directory in a console and issuing "sh i2prouter status"
-should tell you the router's status. The arguments "start", "stop" and "restart"
-control the service. The router console
-can be accessed at its usual location.
-For users on OpenSolaris and other systems for which the wrapper (i2psvc) is not supported,
-start the router with "sh runplain.sh" instead.
-{%- endtrans %}
-
-{% trans faq=site_url('faq') -%}
-When installing for the first time, please remember to adjust your NAT/firewall
-if you can, bearing in mind the Internet-facing ports I2P uses,
-described here among other ports.
-If you have successfully opened your port to inbound TCP, also enable inbound TCP on the
-configuration page.
-{%- endtrans %}
-
-{% trans -%}
-Also, please review and adjust the bandwidth settings on the
-configuration page,
-as the default settings of 96 KBps down / 40 KBps up are fairly slow.
-{%- endtrans %}
-
-{% trans browserconfig=site_url('about/browser-config') -%}
-If you want to reach eepsites via your browser, have a look on the browser proxy setup page for an easy howto.
-{%- endtrans %}
+{% include "downloads/post-install.html" %}
{{ _('Updates from earlier releases:') }}
diff --git a/i2p2www/pages/downloads/post-install.html b/i2p2www/pages/downloads/post-install.html
new file mode 100644
index 00000000..5e60705c
--- /dev/null
+++ b/i2p2www/pages/downloads/post-install.html
@@ -0,0 +1,36 @@
+{{ _('Post-install work') }}
+
+{% trans -%}
+After running the installer on windows, simply click on the "Start I2P" button
+which will bring up the router console,
+which has further instructions.
+{%- endtrans %}
+
+{% trans -%}
+On Unix-like systems, I2P can be started as a service
+using the "i2prouter" script, located in the directory you selected for I2P.
+Changing to that directory in a console and issuing "sh i2prouter status"
+should tell you the router's status. The arguments "start", "stop" and "restart"
+control the service. The router console
+can be accessed at its usual location.
+For users on OpenSolaris and other systems for which the wrapper (i2psvc) is not supported,
+start the router with "sh runplain.sh" instead.
+{%- endtrans %}
+
+{% trans faq=site_url('faq') -%}
+When installing for the first time, please remember to adjust your NAT/firewall
+if you can, bearing in mind the Internet-facing ports I2P uses,
+described here among other ports.
+If you have successfully opened your port to inbound TCP, also enable inbound TCP on the
+configuration page.
+{%- endtrans %}
+
+{% trans -%}
+Also, please review and adjust the bandwidth settings on the
+configuration page,
+as the default settings of 96 KBps down / 40 KBps up are fairly slow.
+{%- endtrans %}
+
+{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach eepsites via your browser, have a look on the browser proxy setup page for an easy howto.
+{%- endtrans %}
diff --git a/i2p2www/pages/downloads/redirect.html b/i2p2www/pages/downloads/redirect.html
new file mode 100644
index 00000000..761d29b2
--- /dev/null
+++ b/i2p2www/pages/downloads/redirect.html
@@ -0,0 +1,14 @@
+{% extends "global/layout.html" %}
+{% block title %}{{ _('Downloading...') }}{% endblock %}
+{% block headextra %}
+
+{% endblock %}
+{% block content %}
+
+
{% trans -%}
+Your download will begin shortly. If it doesn't start within 5 seconds, click here.
+{%- endtrans %}
+