1 files changed, 8 insertions, 9 deletions

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index b35cf373..aedd1e0c 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -6,29 +6,28 @@
           <ul class="footer-list">
             <li><p><a href="about.html">{{ _("About") }}</a></p></li>
             <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
-            <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li>
+            <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
           </ul>
         </div>
         <div class="col-xs-12 col-sm-4">
           <ul class="footer-list">
-            <li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li>
-            <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
-            <li><p><a href="governments.html">{{ _("Governments") }} </a></p></li>
+            <li><p><a href="https://bugs.gnunet.org/">{{ _("Bug Tracker") }}</a></p></li>
+            <li><p><a href="discussion.html">{{ _("Discussion") }}</a></p></li>
+            <li><p><a href="https://logs.gnunet.org/gnunet">{{ _("IRC logs") }}</a></p></li>
           </ul>
         </div>
         <div class="col-xs-12 col-sm-4">
           <ul class="footer-list">
-            <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li>
-            <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
-            <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
+            <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li>
+            <li><p><a href="https://ci.gnunet.org/">{{ _("Continuous Integration") }}</a></p></li>
+            <li><p><a href="https://bibliography.gnunet.org/">{{ _("Bibliography") }}</a></p></li>
           </ul>
         </div>
       </div>
     </div>
   </div>
   <div class="container text-center">
-    <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> {{_("and") }}
-              <a href="http://inria.fr/">Inria</a> 2015, 2016, 2017</p>
+    <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a></p> 2015, 2016, 2017, 2018</p>
     <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
   </div>
 </footer>