diff --git a/web/privacy-policy-de.htm4 b/web/privacy-policy-de.htm4
deleted file mode 100644
index c5bb66d0..00000000
--- a/web/privacy-policy-de.htm4
+++ /dev/null
@@ -1,53 +0,0 @@
-m4_dnl                                                            -*-html-*-
-m4_include(`template.m4')
-m4_dnl $Id$
-
-m4_define(`DE')
-m4_define(`EN_FILE', `privacy-policy.html')
-
-m4_define(`TITLE', `Datenschutzerklärung')
-m4_define(`MAIN', `privacy-policy')
-
-PAGE_START
-
-<div id="main">
-<h2>Datenschutzerklärung</h2>
-<p>
-<strong>Das unten beschriebene Piwik System wurde am 12.3.2014
-abgeschaltet.</strong>
-</p>
-<p>
-Diese Website benutzt Piwik, ein auf Freier Software basierendes
-Webanalyse System, um die Besucher dieser Website statistisch zu
-erfassen.  Piwik zeichnet den Herkunftsstaat, die Art des Webbrowsers,
-das benutzte Betriebssystem sowie die Navigation zwischen den Seiten
-auf.  Dies hilft uns die Qualität unserer Webseiten zu messen und diese
-gegebenenfalls zu verbessern.
-</p>
-
-<p>
-Die benutzte Piwik Installation ist identisch zu der
-der <a href="http://www.gnupg.org">GnuPG</a> Websites and fasst Daten
-mit denen der GnuPG Websites zusammen.  The Datenschutzerklärung der
-GnuPG Websites is identisch zu der hiesigen.
-</p>
-
-<p>
-Unser Piwik System beachtet den Datenschutz und teil-anonymisiert die
-IP Adresse der Besucher.  Dies bedeutet, daß keine personenbezogenen
-Informationen abspeichert werden, obgleich Datensätze zu jedem Besuch
-erzeugt und abgespeichert werden.
-</p>
-
-<p>
-Piwik respektiert die  <a href="http://donottrack.us/">Do Not
-Track</a>  Option, welche von einigen Webbrowsern angeboten wird.  Ist
-diese Option aktiv, so wird Piwik keine Daten aus dem Besuch dieser
-Website erheben oder abspeichern.
-Sie können Piwik auch anweisen, ein
-<a href="http://alberti.gnupg.org/piwik/index.php?module=CoreAdminHome&action=optOut&language=de"
->no track</a> Cookie für diese Website zu setzen.  Mehr Information zu
-den Datenschutzfunktionen von Piwik finden Sie auf
-<a href="http://piwik.org/privacy/">deren Website</a>.
-</p>
-</div>
diff --git a/web/privacy-policy.htm4 b/web/privacy-policy.htm4
deleted file mode 100644
index 825d6be2..00000000
--- a/web/privacy-policy.htm4
+++ /dev/null
@@ -1,54 +0,0 @@
-m4_dnl                                                            -*-html-*-
-m4_include(`template.m4')
-m4_dnl $Id$
-
-m4_define(`EN')
-m4_define(`DE_FILE', `privacy-policy-de.html')
-
-m4_define(`TITLE', `Privacy Policy')
-m4_define(`MAIN', `privacy-policy')
-
-PAGE_START
-
-<div id="main">
-<h2>Privacy Policy</h2>
-<p>
-<strong>The Piwik system described below has been disabled on
-  2014-03-12.</strong>
-</p>
-<p>
-This website uses Piwik, a Free Software web analytics system, to
-monitor traffic on our Web sites. Piwik records the general
-geographical vicinity of visitors as well as their browser and
-operating system, and records their navigation within the sites. This
-helps us gauge the impact of our materials and improve our work.
-</p>
-
-<p>
-The Piwik installation is the same as used for
-the <a href="http://www.gnupg.org">GnuPG</a> websites and thus
-aggregates data with visits to the GnuPG sites.  The privacy policy of
-the GnuPG sites is identical to the one used for
-this <emph>Gpg4win</emph> site.
-
-</p>
-
-<p>
-Our Piwik system preserves privacy by anonymizing visitors´ IP
-addresses. This means that we will not store any personally
-identifiable information about you, even though your visit produces a
-record that our site was visited by someone.
-</p>
-
-<p>
-Piwik also respects the <a href="http://donottrack.us/">Do Not
-Track</a> preference offered by some browsers, so if you have this
-option set, Piwik will ignore your visit entirely.  You may also ask
-Piwik to <a
-href="http://alberti.gnupg.org/piwik/index.php?module=CoreAdminHome&action=optOut&language=en"
->set a no track</a> cookie for this site.
-Details of how Piwik protects privacy are
-on <a href="http://piwik.org/privacy/">their website</a>.
-</p>
-</iframe>
-</div>
diff --git a/web/template_header.m4 b/web/template_header.m4
index 55c5b01a..314d5654 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -1,148 +1,146 @@
 m4_dnl                                                        -*-html-*-
 m4_dnl THIS IS INCLUDED BY `template.m4'
 m4_dnl DONT USE THIS FILE DIRECTLY
 m4_ifdef(`__TMPL_ROOT',,`m4_define(`__TMPL_ROOT',`')')
 
 m4_define(`__TITLE',m4_dnl
 I18N(`EN',`Secure E-Mail and File Encryption using GnuPG for Windows')`'m4_dnl
 I18N(`DE',`Sichere E-Mail- und Datei-Verschlüsselung mit GnuPG für Windows'))
 
 m4_ifdef(`__TMPL_PAGE_TITLE',,`m4_define(`__TMPL_PAGE_TITLE',`Gpg4win - 'TITLE)')
 
 m4_define(`LINK',
     `m4_ifelse($1, NO_LINK_FOR,
         `$2',
         `<a href="$1">$2</a>')')
 m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
 'm4_changequote`'')m4_dnl trick for inserting right quotes from http://mbreen.com/m4.html#quotemacro
 
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="keywords" content="Gpg4win, GnuPG, GPA, GpgOL, E-Mail, Email, Windows, PGP, GPG, OpenPGP, S/MIME, Outlook, I18N(`EN', `Encryption, secure, security') I18N(`DE', `Verschlüsselung, sicher, Sicherheit')">
   <link rel="stylesheet" type="text/css" href="__TMPL_ROOT`'gpg4win.css">
   <link rel="shortcut icon" href="__TMPL_ROOT`'favicon.png" type="image/png" />
   <title>__TMPL_PAGE_TITLE</title>
  </head>
  <body>
  <a name="top"></a>
  <div class="wrapper">
  <div class="header">
   <div class="language_select">
    <img src="img/english.png"> LANG_LINK(`EN',`English', EN_FILE) |
    <img src="img/german.png"> LANG_LINK(`DE',`Deutsch', DE_FILE)
   </div>
  </div>
  m4_ifdef(`EN_FILE', `m4_define(`LANG_DE', `1')', `m4_define(`LANG_DE', `0')')
  <div id="menu">
   <ul>
    <li class="mlogo">
     m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
    </li>
    <li class="mwhatsnew">
     m4_ifelse(LANG_DE, `1', `<a href="version3-de.html" title="Was ist in Version 3 neu"><div>Was ist neu</br>Version 3</div></a>', `<a href="version3.html" title="What is new in version 3"><div>What`'RQ()s new</br>Version 3</div></a>')
    </li>
    <li class="mbetween">
     m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
    </li>
    MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
     <ul>
      MENU(`about', `Über Gpg4win', `About Gpg4win', `about', SUB, LANG_DE)
      MENU(`features', `Funktionen', `Features', `features', SUB, LANG_DE)
      MENU(`system-requirements', `Systemvorraussetzungen', `System Requirements', `system-requirements', SUB, LANG_DE)
      MENU(`documentation', `Dokumentation', `Documentation', `documentation', SUB, LANG_DE)
      MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', SUB, LANG_DE)
-     MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', SUB, LANG_DE)
      <li class="subcap"></li>
     </ul>
    </li>
    MENU(`community', `Gemeinschaft', `Community', `community', MAIN, LANG_DE)
     <ul>
      MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
      MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
      <li class="subcap"></li>
     </ul>
    </li>
    MENU(`support', `Support', `Support', `support', MAIN, LANG_DE)
    </li>
    <li class="mdonate">
     m4_ifelse(LANG_DE, `1', `<a href="get-gpg4win-de.html">Download</a>', `<a href="get-gpg4win.html">Download</a>')
     </li>
   </ul>
  </div>
   m4_include(`header.m4')
   <div class="content">
    m4_divert(999)
   <br clear="all" />
   </div>
   </div>
 
   <div id="footer">
    <br>
    <div id="sitemap">
     <ul>
      <li><a href="index-de.html"></a></li>
      MENU(`download', `Alle Downloads', `All Downloads', `download', MAIN, LANG_DE)
      <li>
        <a href="https://twitter.com/gpg4win" target="_blank" title="Follow @gpg4win">
          <img src="img/twitter-icon.png" class="social-icon">
        </a>
        <a href="https://flattr.com/thing/2053326/Gpg4win-Secure-email-and-file-encryption-with-GnuPG-for-Windows"
            target="_blank" title="Flattr this">
          <img src="img/flattr-icon.png" class="social-icon">
        </a>
        <a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary" target="_blank" title="Gpg4win git repository">
          <img src="img/git-icon.png" class="social-icon">
        </a>
      </li>
     </ul>
 
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Über Gpg4win', `About Gpg4win')
      </b></li>
      MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
      MENU(`features', `Funktionen', `Features', `features', MAIN, LANG_DE)
      MENU(`system-requirements', `System Vorraussetzungen', `System Requirements', `system-requirements', SUB, LANG_DE)
      MENU(`documentation', `Dokumentation', `Documentation', `documentation', SUB, LANG_DE)
      MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', MAIN, LANG_DE)
-     MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', MAIN, LANG_DE)
     </ul>
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Gemeinschaft', `Community')
      </b></li>
      MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
      MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
      MENU(`reporting-bugs', `- Probleme melden', `- Reporting Bugs', `reporting-bugs', SUB, LANG_DE)
      MENU(`build-installer', `- Bau von Gpg4win', `- Building of Gpg4win', `build-installer', SUB, LANG_DE)
      MENU(`website-maintenance', `- Website pflegen', `- Maintaining Website', `website-maintenance', SUB, LANG_DE)
      </li>
      m4_ifelse(LANG_DE, `1', `<li><a href="localize-gpg4win.html">- Gpg4win übersetzen</a></li>', `<li><a href="localize-gpg4win.html">- Translating Gpg4win</a></li>')
     </ul>
     <ul>
      <li><b>Support</b></li>
      MENU(`support', `Support', `Support', `support', MAIN, LANG_DE)
     </ul>
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Diverses', `Misc')
      </b></li>
      MENU(`donate', `Spenden', `Donate', `donate', SUB, LANG_DE)
      MENU(`license', `Lizenz', `License', `license', SUB, LANG_DE)
      m4_ifelse(LANG_DE, `1', `<li><a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Quellcode</a></li>',
          `<li><a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Source Code</a></li>')
      <li><a href="http://wiki.gnupg.org">Wiki</a></li>
      m4_ifelse(LANG_DE, `1', `<li><a href="http://wald.intevation.org/projects/gpg4win/">Entwicklungsplattform</a></li>',
          `<li><a href="http://wald.intevation.org/projects/gpg4win/">Development Platform</a></li>')
      m4_ifelse(LANG_DE, `1', `<li><a href="Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html">Kurzstudie Gpg4win</a></li>',
          `<li><a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">Short Study Gpg4win</a></li>')
      MENU(`links', `Links', `Links', `links', SUB, LANG_DE)
      MENU(`contributors', `Mitwirkende', `Contributors', `contributors', SUB, LANG_DE)
      MENU(`impressum', `Impressum', `Legal Notice', `impressum', SUB, LANG_DE)
     </ul>
   </div>
   </div>
    </body>
 </html>
 m4_divert