diff --git a/website/master/download.html.in b/website/master/download.html.in
index 5682f027..e10b71a9 100644
--- a/website/master/download.html.in
+++ b/website/master/download.html.in
@@ -141,6 +141,9 @@ for NLS,
 
 <pre class="pre-x-scrollable">$ svn export svn://dev.exiv2.org/svn/tags/__version__/test</pre>
 
+<p>The <a href="http://dev.exiv2.org/projects/exiv2/wiki" title="Exiv2 community website">Exiv2 community website</a>
+ provides access to further project resources, including the issue tracker, wiki and forum.</p>
+
 <h2 id="license">License</h2>
 
 <p>Exiv2 is <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>; 
diff --git a/website/master/getting-started.html.in b/website/master/getting-started.html.in
index e41bfa3d..b275c2b3 100644
--- a/website/master/getting-started.html.in
+++ b/website/master/getting-started.html.in
@@ -23,7 +23,11 @@ __navbar__
       <div class="col-sm-6">
 	<h2 id="lib">Exiv2 C++ library</h2>
 	<ul>
-	  <li>Fast read and write access to the Exif, IPTC, and XMP metadata of an image</li>
+	  <li>Fast read and write access to the
+	    <a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
+	    <a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
+	    <a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a>
+	    <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a> of an image</li>
 	  <li>Easy to use and <a href="doc/index.html" title="Exiv2 API documentation">extensively documented</a> C++ API</li>
 	  <li><a href="conversion.html" title="Exiv2 Conversions">Conversions</a> of Exif and IPTC metadata to XMP and vice versa</li>
 	  <li>Smart IPTC implementation that does not affect data that programs like Photoshop store
@@ -41,8 +45,11 @@ __navbar__
       <div class="col-sm-6">
 	<h2 id="util">Command line utility</h2>
 	<ul>
-	  <li>Print Exif, IPTC and XMP image metadata in different formats: Exif summary info, interpreted values,
-	    or the plain data for each tag</li>
+	  <li>Print <a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
+            <a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
+            <a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a> image
+            <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a> in different formats: 
+	    Exif summary info, interpreted values, or the plain data for each tag</li>
 	  <li><a title="Modify" href="sample.html#modify">Set, add and delete</a> Exif, IPTC and XMP image metadata
 	    from command line modify commands or command scripts</li>
 	  <li>Adjust the Exif timestamp (that's how it all started...)</li>
diff --git a/website/master/index.html.in b/website/master/index.html.in
index 7b9e2a53..0984f474 100644
--- a/website/master/index.html.in
+++ b/website/master/index.html.in
@@ -9,12 +9,8 @@ __navbar__
 	<img src="include/exiv2-logo-big.png" alt="Exiv2 home page">
 	__maintitle__
 	<p class="lead">Exiv2 is a <a href="getting-started.html#lib">C++ library</a> and a <a href="getting-started.html#util">command line utility</a>
-	  to manage image <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a>.
-	  It provides fast and easy read and write access to the 
-	  <a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
-	  <a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
-	  <a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a> metadata 
-	  of images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
+	  to manage image metadata. It provides fast and easy read and write access to the Exif, IPTC and XMP metadata
+	  of digital images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
 	  Exiv2 is available as <a href="download.html#license">free software</a> and with a 
 	  <a href="download.html#license">commercial license</a>, and is used in many projects.
         </p>
diff --git a/website/var/__navbar2__ b/website/var/__navbar2__
index e213c9fe..ab026b10 100644
--- a/website/var/__navbar2__
+++ b/website/var/__navbar2__
@@ -13,12 +13,12 @@
     </div>
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="../getting-started.html">Getting started</a></li>
+        <li><a href="../getting-started.html">Overview</a></li>
         <li><a href="../download.html">Download</a></li>
         <li><a href="../metadata.html">Metadata</a></li>
         <li><a href="../makernote.html">Makernote</a></li>
         <li class="dropdown active">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">API doc <span class="caret"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">API <span class="caret"></span></a>
           <ul class="dropdown-menu">
             <li><a href="index.html"><span class="glyphicon glyphicon-home" aria-hidden="true"></span>&nbsp; Quick start</a></li>
             <li><a href="namespaceExiv2.html"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>&nbsp; Namespace reference</a></li>
@@ -29,6 +29,17 @@
           </ul>
         </li>
         <li><a href="../manpage.html">Manpage</a></li>
+	<li class="dropdown">
+          <a href="#" title="Links to the Exiv2 community website" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="http://dev.exiv2.org/projects/exiv2/activity?show_issues=1&show_changesets=1&show_messages=1"><span class="glyphicon glyphicon-dashboard" aria-hidden="true"></span>&nbsp; Activity</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/roadmap"><span class="glyphicon glyphicon-road" aria-hidden="true"></span>&nbsp; Roadmap</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/issues"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>&nbsp; Issues</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/wiki"><span class="glyphicon glyphicon-book" aria-hidden="true"></span>&nbsp; Wiki</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/boards"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span>&nbsp; Forum</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/repository"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>&nbsp; Repository</a></li>
+          </ul>
+	</li>
       </ul>
     </div><!--/.nav-collapse -->
   </div>
diff --git a/website/var/__navbar__ b/website/var/__navbar__
index a2bda1a8..352ba65f 100644
--- a/website/var/__navbar__
+++ b/website/var/__navbar__
@@ -13,12 +13,23 @@
     </div>
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="getting-started.html">Getting started</a></li>
+        <li><a href="getting-started.html">Overview</a></li>
         <li><a href="download.html">Download</a></li>
         <li><a href="metadata.html">Metadata</a></li>
         <li><a href="makernote.html">Makernote</a></li>
-        <li><a href="doc/index.html">API doc</a></li>
+        <li><a href="doc/index.html">API</a></li>
         <li><a href="manpage.html">Manpage</a></li>
+	<li class="dropdown">
+          <a href="#" title="Links to the Exiv2 community website" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="http://dev.exiv2.org/projects/exiv2/activity?show_issues=1&show_changesets=1&show_messages=1"><span class="glyphicon glyphicon-dashboard" aria-hidden="true"></span>&nbsp; Activity</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/roadmap"><span class="glyphicon glyphicon-road" aria-hidden="true"></span>&nbsp; Roadmap</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/issues"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>&nbsp; Issues</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/wiki"><span class="glyphicon glyphicon-book" aria-hidden="true"></span>&nbsp; Wiki</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/boards"><span class="glyphicon glyphicon-comment" aria-hidden="true"></span>&nbsp; Forum</a></li>
+            <li><a href="http://dev.exiv2.org/projects/exiv2/repository"><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>&nbsp; Repository</a></li>
+          </ul>
+	</li>
       </ul>
     </div><!--/.nav-collapse -->
   </div>