diff --git a/i2p2www/pages/site/browser/faq.html b/i2p2www/pages/site/browser/faq.html
new file mode 100644
index 00000000..a30c32b2
--- /dev/null
+++ b/i2p2www/pages/site/browser/faq.html
@@ -0,0 +1,64 @@
+{% extends "global/layout.html" %}
+{% block title %}{{ _('The I2P Browser') }}{% endblock %}
+{% block content_nav %}
+<ol>
+<li style="list-style: none; display: inline">
+<h4>{{ _('General') }}</h4>
+</li>
+<li><a href="#what">{% trans %}What is it and how does it work?{% endtrans %}</a></li>
+<li><a href="#why">{% trans %}Why did we make it?{% endtrans %}</a></li>
+<li><a href="#the-problem">{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a></li>
+<li><a href="#development-help">{% trans %}How can I help out with development?{% endtrans %}</a></li>
+<li><a href="#keeping-up-to-date">{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a></li>
+<li><a href="#funding">{% trans %}How can fund development?{% endtrans %}</a></li>
+</ol>
+{% endblock %}
+
+
+{% block content %}
+<h2>General</h2>
+<h3 id="what"><span class="permalink"><a href="#what">
+{% trans %}What is it and how does it work?{% endtrans %}</a> </span></h3>
+
+<p>{% trans -%}It’s a web browser, like all others it enables you to browse and search the web. I2P Browser is however very focused on the privacy rights of the user and does not favour a company’s income in trade of the users privacy. As of the writing moment I2P browser is made to work with I2P, but with some adjustments it should just as well work with Tor or on the internet.{%- endtrans %}</p>
+
+
+<h3 id="why"><span class="permalink"><a href="#why">
+{% trans %}Why did we make it?{% endtrans %}</a></span>
+</h3>
+
+<p>{% trans -%}The main reason we made it is because as any other very technical project it can be hard for mr smith in the street to get himself into this and figure out how to benefit from it. The I2P Browser was therefore made to extend the user base of I2P to non-super technical people and make it a worthy alternative to Tor.{%- endtrans %}</p>
+
+
+
+<h3 id="the-problem"><span class="permalink"><a href="#the-problem">
+{% trans %}Who is it for, what problem does it solve?{% endtrans %}</a></span>
+</h3>
+
+<p>{% trans -%}It’s for both technical and non technical people who wish to protect their privacy either because of preferences or safety, no matter who they are and where they are. It should make a lot of potential dangers harmless for these people that they will encounter on the internet. For example stop spying software that’s targeted or not. It also per default disables a lot of features which are questionable in terms of security and privacy concerns.{%- endtrans %}</p>
+
+
+
+<h3 id="development-help"><span class="permalink"><a href="#development-help">
+{% trans %}How can I help out with development?{% endtrans %}</a></span>
+</h3>
+
+<p>{% trans -%}The development happens on github, anyone can create a github account and make a pull request for either some bug they have discovered, or a trac ticket they found and wanted to solve, translations and so on.{%- endtrans %}</p>
+
+
+
+<h3 id="keeping-up-to-date"><span class="permalink"><a href="#keeping-up-to-date">
+{% trans %}Where can I keep up to date with what is going on/ where is the conversation?{% endtrans %}</a></span>
+</h3>
+
+<p>{% trans -%}For the moment it’s only on trac.i2p2.de - but we plan to start using mailing lists found at https://lists.i2p.email/postorius/lists/ - Also found at http://lists.i2p inside i2p.{%- endtrans %}</p>
+
+
+<h3 id="funding"><span class="permalink"><a href="#funding">
+{% trans %}How can fund development?{% endtrans %}</a></span>
+</h3>
+
+<p>{% trans -%}Per today the way to fund it is to fund I2P itself, we consider to upgrade our donation program to enable donators to specify which parts of the I2P project they wish to fund, if it’s the router core, the console, the browser or any other component that can be seen as a sub project of I2P.{%- endtrans %}</p>
+
+
+{% endblock %}
diff --git a/i2p2www/pages/site/browser/intro.html b/i2p2www/pages/site/browser/intro.html
new file mode 100644
index 00000000..5aae57f5
--- /dev/null
+++ b/i2p2www/pages/site/browser/intro.html
@@ -0,0 +1,17 @@
+{% extends "global/layout.html" %}
+{% block title %}{{ _('The I2P Browser') }}{% endblock %}
+{% block content_nav %}
+<ol>
+<li style="list-style: none; display: inline">
+<h4>{{ _('General') }}</h4>
+</li>
+</ol>
+{% endblock %}
+
+
+{% block content %}
+
+TBA.
+
+{% endblock %}
+