diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py
index 9554d57a40fa35cbc73fdd55084896ba32a5cec3..e3ff2231c7a623e853c14ae8c8383247bd554cdd 100644
--- a/i2p2www/downloads.py
+++ b/i2p2www/downloads.py
@@ -66,6 +66,10 @@ def downloads_list():
 def downloads_debian():
     return render_template('downloads/debian.html')
 
+# Windows-specific page
+def downloads_windows():
+    return render_template('downloads/windows.html')
+
 # Firefox-specific page
 def downloads_firefox():
     # TODO: read mirror list or list of available files
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index f664d93eb7e91d60d7e26f8d0e3c44f0e85bcfdc..f75b506a4c65a1696dd745523c52d9c4ffe74660 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -80,9 +80,11 @@ I2P connections.</p>
 
 {% call package('windows') %}
     <p>{% trans -%}
-    Download the file and run it.
+    Download the file and double-click to run it.
     {%- endtrans %}</p>
-
+    <div class="file">
+      <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}If you need additional help setting up dependencies and getting I2P ready, a detailed install guide is available here.{% endtrans %}</a>
+    </div>
     <div class="file">
       <a class="default" href="/firefox">{% trans %}I2P Firefox Browser Profile{% endtrans %}</a>
     </div>
diff --git a/i2p2www/pages/downloads/windows.html b/i2p2www/pages/downloads/windows.html
new file mode 100644
index 0000000000000000000000000000000000000000..66fe861d1a7b63bb12b82ef740912c993336e609
--- /dev/null
+++ b/i2p2www/pages/downloads/windows.html
@@ -0,0 +1,175 @@
+{% extends "global/layout.html" %}
+{% block title %}Microsoft Windows{% endblock %}
+{% block content %}
+<h1>{{ _('Installing I2P, its dependencies, and recommended external software on Windows 10') }}</h1>
+
+<p>{% trans -%}This is a detailed, step-by-step guide to installing and configuring I2P, including
+all dependencies and setting up a browser, on a new Windows 10 system. Many users
+will be able to skip steps if they already have Java 8 or Firefox installed.{%- endtrans %}</p>
+
+<h2>{{ _('So what are we going to do here?') }}</h2>
+
+<p>{% trans -%}We're going to finish four tasks. We are going to:{%- endtrans %}</p>
+
+<ol>
+<li><a href="#part-one-install-java">{% trans -%}Install Java{%- endtrans %}</a></li>
+<li><a href="#part-two-install-i2p">{% trans -%}Install I2P{%- endtrans %}</a></li>
+<li><a href="#part-three-install-a-real-browserfirefox">{% trans -%}Install a Better Browser(Firefox){%- endtrans %}</a></li>
+<li><a href="#part-four-configure-i2p-bandwidth">{% trans -%}Configure I2P Bandwidth{%- endtrans %}</a></li>
+</ol>
+
+<h3 id="part-one-install-java">{{ _('Part One: Install Java') }}</h3>
+
+<p>{% trans -%}In order to use I2P, you will need a suitable Java environment. On Windows, users should
+probably choose Oracle's Java 8 implementation. Please install it by following the
+instructions below:{%- endtrans %}</p>
+
+<p>{% trans -%}If you already have Java installed, you may{%- endtrans %} <a href="#part-two-install-i2p">Skip This Step</a></p>
+
+<ol>
+<li>{% trans -%}I2P requires Java to run, if you don't have Java installed, you will get an error
+that looks like this:{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/nojava.png" alt="Uh oh, no Java yet" title="" /></li>
+</ul></li>
+<li>{% trans -%}We appreciate that you have a wide range of choices in Java software, but the Oracle
+Java software is the easiest to install and use with I2P on Windows.{%- endtrans %} <a href="https://java.com/en/download/">Please use this version from Oracle</a>.
+<ul>
+<li><img src="/_static/images/download/windows/oraclejava.png" alt="You need Oracle Java for Windows" title="" /></li>
+</ul></li>
+<li>{% trans -%}Download it from{%- endtrans %} <a href="https://java.com/en/download/">here</a>:
+<ul>
+<li><img src="/_static/images/download/windows/getjava.png" alt="So download it" title="" /></li>
+</ul></li>
+<li>{% trans -%}Double-click the Java Installer you just downloaded. Don't set a custom path, just
+use the default one.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/startjava.png" alt="Start installing Java" title="" /></li>
+</ul></li>
+<li>{% trans -%}Java will show you some information about what it is and where it runs while you
+wait for it to finish installing.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/installjava.png" alt="Step one" title="" /></li>
+</ul></li>
+<li>{% trans -%}When you see this, Java is almost installed.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/installjava2.png" alt="Step two" title="" /></li>
+</ul></li>
+<li>{% trans -%}Java is now installed!{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/installedjava.png" alt="You're done!" title="" /></li>
+</ul></li>
+</ol>
+
+<h3 id="part-two-install-i2p">{{ _('Part Two: Install I2P') }}</h3>
+
+<ol>
+<li>{% trans -%}Download I2P from{%- endtrans %} <a href="https://geti2p.net">{% trans -%}https://geti2p.net{%- endtrans %}</a>.
+<ul>
+<li><img src="/_static/images/download/windows/geti2p.png" alt="Download I2P" title="" /></li>
+</ul></li>
+<li>{% trans -%}'I2P is available in many languages. Pick one that is familiar to you.'{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/i2plang.png" alt="Select your Language" title="" /></li>
+</ul></li>
+<li>{% trans -%}On the first screen, we introduce our software.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/i2pnext.png" alt="Introduction" title="" /></li>
+</ul></li>
+<li>{% trans -%}I2P is mostly public domain software, with permissive licenses and a small amount of GPL2'ed
+Free Software.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/i2plicense.png" alt="Accept the License Agreement(or mostly lack thereof)" title="" /></li>
+</ul></li>
+<li>{% trans -%}You should probably leave I2P installed at the default path, as it is easiest to work with this
+way.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/i2ppath.png" alt="Select the path to install to" title="" /></li>
+</ul></li>
+<li>{% trans -%}Don't bother running it as a Windows service for now, an easy-to-use shortcut will be added to
+the start menu for you to control I2P with.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/installbase.png" alt="Select Components" title="" /></li>
+</ul></li>
+<li>{% trans -%}I2P will copy it's files into the install location.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/installrun.png" alt="Wait a moment" title="" /></li>
+</ul></li>
+<li>{% trans -%}I2P is now installed! You can start it using the "Start I2P" entries in your Start Menu and on your Desktop.{%- endtrans %} <img src="/_static/images/download/windows/installed.png" alt="Finish it up" title="" /></li>
+</ol>
+
+<h3 id="part-three-install-a-real-browserfirefox">{{ _('Part Three: Install a Better Browser(Firefox or Tor Browser)') }}</h3>
+
+<p>{% trans -%}If you already have either Firefox or Tor Browser installed, skip the first 2 steps.{%- endtrans %}</p>
+
+<p>{% trans -%}Unfortunately for Windows users, Microsoft Edge does not have proxy settings that are safe to use with I2P. The browser
+that is easiest to configure with I2P in a reasonably good way is Firefox(Although Chrome is possible, this procedure
+is only recommended for experts). I2P participants who want to browse I2P Sites can follow these steps to install
+and configure Firefox for I2P.{%- endtrans %} </p>
+
+<p>{% trans -%}If you already have Firefox installed, you may{%- endtrans %} <a href="#install-the-i2p-firefox-profile">Skip This Step</a></p>
+
+<ol>
+<li>{% trans -%}Get Firefox from{%- endtrans %} <a href="https://mozilla.org">htps://mozilla.org</a>.
+<ul>
+<li><img src="/_static/images/download/windows/firefox.png" alt="Get Firefox" title="" /></li>
+</ul></li>
+<li>{% trans -%}Run the installer.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/firefox-installer.png" alt="Run the installer" title="" /></li>
+</ul></li>
+</ol>
+
+<h4>{{ _('Install the I2P Firefox Profile') }}</h4>
+
+<ol>
+<li>{% trans -%}Download the Firefox Profile Bundle from the I2P Web Site.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/profile.png" alt="Grab the Firefox Profile" title="" /></li>
+</ul></li>
+<li>{% trans -%}Select the language you want to use for the install process.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/profilelang.png" alt="Select your language" title="" /></li>
+</ul></li>
+<li>{% trans -%}The Profile Bundle incorporates lots of external software, so it has a detailed license 
+document. All of the external software is Free and Open Source, with the license included.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/profilelicense.png" alt="Accpt the License Agreement" title="" /></li>
+</ul></li>
+<li>{% trans -%}You now have a browser ready for I2P!{%- endtrans %} <img src="/_static/images/download/windows/profiledone.png" alt="Now your browser is configured" title="" /></li>
+</ol>
+
+<h3 id="part-four-configure-i2p-bandwidth">{{ _('Part Four: Configure I2P Bandwidth') }}</h3>
+
+<ol>
+<li>{% trans -%}When you visit the I2P router console for the first time, it will automatically direct you to the bandwidth
+configuration wizard.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/bwintro.png" alt="Start the bandwidth wizard" title="" /></li>
+</ul></li>
+<li>{% trans -%}During the bandwidth test, we'll need to connect to the external M-Lab Service, which makes{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/bwdisclaimer.png" alt="Let the participant know what the bandwidth test entails" title="" /></li>
+</ul></li>
+<li>{% trans -%}The bandwidth test takes about a minute to run completely.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/bwtest.png" alt="Run the bandwidth test" title="" /></li>
+</ul></li>
+<li>{% trans -%}Here we have an overview of the applications.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/bwbrowser.png" alt="Suggest browser and application configuration" title="" /></li>
+</ul></li>
+<li>{% trans -%}Now you have your bandwidth configured to efficiently contribute to I2P.{%- endtrans %}
+<ul>
+<li><img src="/_static/images/download/windows/bwdone.png" alt="Welcome to the Invisible Internet" title="" /></li>
+</ul></li>
+</ol>
+
+<p>{% trans -%}If you want to re-run the welcome wizard after completing it, you can visit the page
+on{%- endtrans %} <a href="http://localhost:7657/welcome">your router console</a>.</p>
+
+<p>{% trans -%}That's it! You're now ready to use I2P. You can browse I2P sites, download files, host services,
+e-mail and chat anonymously. Visit the <a href="https://localhost:7657/home">router console homepage</a> to
+get started.{%- endtrans %}</p>
+
+{% endblock %}
diff --git a/i2p2www/static/images/download/windows/bwbrowser.png b/i2p2www/static/images/download/windows/bwbrowser.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b3b10ec963e87885871b6d540fee8f6e6ec17d
Binary files /dev/null and b/i2p2www/static/images/download/windows/bwbrowser.png differ
diff --git a/i2p2www/static/images/download/windows/bwdisclaimer.png b/i2p2www/static/images/download/windows/bwdisclaimer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef0f8c394dbb9a399fbbf46773c1ae523c5ce1c5
Binary files /dev/null and b/i2p2www/static/images/download/windows/bwdisclaimer.png differ
diff --git a/i2p2www/static/images/download/windows/bwdone.png b/i2p2www/static/images/download/windows/bwdone.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c6340297d01bcefe5ea0abde1c6bb74371f870
Binary files /dev/null and b/i2p2www/static/images/download/windows/bwdone.png differ
diff --git a/i2p2www/static/images/download/windows/bwintro.png b/i2p2www/static/images/download/windows/bwintro.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa772fdbc234be181a58fb5ff4178fcb990b0c1c
Binary files /dev/null and b/i2p2www/static/images/download/windows/bwintro.png differ
diff --git a/i2p2www/static/images/download/windows/bwtest.png b/i2p2www/static/images/download/windows/bwtest.png
new file mode 100644
index 0000000000000000000000000000000000000000..d829c10df9e2a16ac7ecf3eb41d87c983840fc22
Binary files /dev/null and b/i2p2www/static/images/download/windows/bwtest.png differ
diff --git a/i2p2www/static/images/download/windows/firefox-installer.png b/i2p2www/static/images/download/windows/firefox-installer.png
new file mode 100644
index 0000000000000000000000000000000000000000..d07721a30cefb37c9a5b950e6baeae1caeca655b
Binary files /dev/null and b/i2p2www/static/images/download/windows/firefox-installer.png differ
diff --git a/i2p2www/static/images/download/windows/firefox.png b/i2p2www/static/images/download/windows/firefox.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5a067f50d4439e79d8bb82b3aef413d70cf0c16
Binary files /dev/null and b/i2p2www/static/images/download/windows/firefox.png differ
diff --git a/i2p2www/static/images/download/windows/geti2p.png b/i2p2www/static/images/download/windows/geti2p.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4672b2be7e4e83d1b604ba8d9b3ebc40b496a84
Binary files /dev/null and b/i2p2www/static/images/download/windows/geti2p.png differ
diff --git a/i2p2www/static/images/download/windows/getjava.png b/i2p2www/static/images/download/windows/getjava.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d98d1c511a899eb7342fc5f586eb19b202a51f
Binary files /dev/null and b/i2p2www/static/images/download/windows/getjava.png differ
diff --git a/i2p2www/static/images/download/windows/i2plang.png b/i2p2www/static/images/download/windows/i2plang.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8356b8fb36610c522b9d4fab7bfbfabde4919e3
Binary files /dev/null and b/i2p2www/static/images/download/windows/i2plang.png differ
diff --git a/i2p2www/static/images/download/windows/i2plicense.png b/i2p2www/static/images/download/windows/i2plicense.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce93df5cae5fcaba2d35711cce4301de9e1f952
Binary files /dev/null and b/i2p2www/static/images/download/windows/i2plicense.png differ
diff --git a/i2p2www/static/images/download/windows/i2pnext.png b/i2p2www/static/images/download/windows/i2pnext.png
new file mode 100644
index 0000000000000000000000000000000000000000..554be4fbcb489e602496fba92023caf2f74a6fd1
Binary files /dev/null and b/i2p2www/static/images/download/windows/i2pnext.png differ
diff --git a/i2p2www/static/images/download/windows/i2ppath.png b/i2p2www/static/images/download/windows/i2ppath.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f43086f26bf4a736a1ee22f2d1a4db0608c04b8
Binary files /dev/null and b/i2p2www/static/images/download/windows/i2ppath.png differ
diff --git a/i2p2www/static/images/download/windows/installbase.png b/i2p2www/static/images/download/windows/installbase.png
new file mode 100644
index 0000000000000000000000000000000000000000..46c5cd584c73fe7d3cf290303d98f5d12ef3c8cd
Binary files /dev/null and b/i2p2www/static/images/download/windows/installbase.png differ
diff --git a/i2p2www/static/images/download/windows/installed.png b/i2p2www/static/images/download/windows/installed.png
new file mode 100644
index 0000000000000000000000000000000000000000..98cba1339d26e5da607967a882e0f96262f95430
Binary files /dev/null and b/i2p2www/static/images/download/windows/installed.png differ
diff --git a/i2p2www/static/images/download/windows/installedjava.png b/i2p2www/static/images/download/windows/installedjava.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5b01f3772200fc4ff507a1bd366f965e6a921ed
Binary files /dev/null and b/i2p2www/static/images/download/windows/installedjava.png differ
diff --git a/i2p2www/static/images/download/windows/installjava.png b/i2p2www/static/images/download/windows/installjava.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d605095edb4a09dbdf2f1aadf2f67d9b564684
Binary files /dev/null and b/i2p2www/static/images/download/windows/installjava.png differ
diff --git a/i2p2www/static/images/download/windows/installjava2.png b/i2p2www/static/images/download/windows/installjava2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c5e5a6dd165a246a3d969a15f34b9b22ddb7520
Binary files /dev/null and b/i2p2www/static/images/download/windows/installjava2.png differ
diff --git a/i2p2www/static/images/download/windows/installrun.png b/i2p2www/static/images/download/windows/installrun.png
new file mode 100644
index 0000000000000000000000000000000000000000..bada653edb0bc0a983b4c62acf8306bae2e5b902
Binary files /dev/null and b/i2p2www/static/images/download/windows/installrun.png differ
diff --git a/i2p2www/static/images/download/windows/installshortcuts.png b/i2p2www/static/images/download/windows/installshortcuts.png
new file mode 100644
index 0000000000000000000000000000000000000000..71507572822b8af4f18cb8135e8997f870b87aab
Binary files /dev/null and b/i2p2www/static/images/download/windows/installshortcuts.png differ
diff --git a/i2p2www/static/images/download/windows/nojava.png b/i2p2www/static/images/download/windows/nojava.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9de3258b1f531621baff9097925be8cb5ff05fa
Binary files /dev/null and b/i2p2www/static/images/download/windows/nojava.png differ
diff --git a/i2p2www/static/images/download/windows/oraclejava.png b/i2p2www/static/images/download/windows/oraclejava.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2d9fc5f74b42f0f82ac0aaba730bb2112ba1fa8
Binary files /dev/null and b/i2p2www/static/images/download/windows/oraclejava.png differ
diff --git a/i2p2www/static/images/download/windows/profile.png b/i2p2www/static/images/download/windows/profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae15bebd16abece89b08a3d8e5e1624dd0b0a39
Binary files /dev/null and b/i2p2www/static/images/download/windows/profile.png differ
diff --git a/i2p2www/static/images/download/windows/profiledone.png b/i2p2www/static/images/download/windows/profiledone.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde74d8cb19897b701929368605859b5db04ed53
Binary files /dev/null and b/i2p2www/static/images/download/windows/profiledone.png differ
diff --git a/i2p2www/static/images/download/windows/profilelang.png b/i2p2www/static/images/download/windows/profilelang.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87adb20822d7a1bc6b32de42a4429c398a5c3a7
Binary files /dev/null and b/i2p2www/static/images/download/windows/profilelang.png differ
diff --git a/i2p2www/static/images/download/windows/profilelicense.png b/i2p2www/static/images/download/windows/profilelicense.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c2a28665900237f4682cb756b67079ada0ad69
Binary files /dev/null and b/i2p2www/static/images/download/windows/profilelicense.png differ
diff --git a/i2p2www/static/images/download/windows/startjava.png b/i2p2www/static/images/download/windows/startjava.png
new file mode 100644
index 0000000000000000000000000000000000000000..2da48a8e8a03bc860943c8c68df493dc6a2bf654
Binary files /dev/null and b/i2p2www/static/images/download/windows/startjava.png differ
diff --git a/i2p2www/urls.py b/i2p2www/urls.py
index 58fea21ffb489afffd696134f7c5a758759c179b..ab778f4a56ff32d804b4d3346b8da90cc1e919e3 100644
--- a/i2p2www/urls.py
+++ b/i2p2www/urls.py
@@ -90,6 +90,7 @@ url('/<lang:lang>/browser/develop', 'browser.browser_develop')
 
 url('/<lang:lang>/download', 'downloads.downloads_list')
 url('/<lang:lang>/download/debian', 'downloads.downloads_debian')
+url('/<lang:lang>/download/windows', 'downloads.downloads_windows')
 url('/<lang:lang>/download/firefox', 'downloads.downloads_firefox')
 url('/<lang:lang>/download/config', 'downloads.downloads_config')
 url('/<lang:lang>/download/lab', 'downloads.downloads_lab')