diff --git a/web/header.m4 b/web/header.m4
index 248b9d55..85dd26db 100644
--- a/web/header.m4
+++ b/web/header.m4
@@ -1,89 +1,87 @@
   m4_ifdef(`FANCY_HEADER', `
   <div class="fancy_intro">
    <div id="download_button">
      m4_ifelse(LANG_DE, `1', `
      <a href="get-gpg4win-de.html">
      <span class="text">
       Download<br />Gpg4win VERSION
      </span></a>', `
      <a href="get-gpg4win.html">
      <span class="text">
       Download<br />Gpg4win VERSION
      </span></a>')
    </div>
    <div class="download_button_links">
      m4_ifelse(LANG_DE, `1', `
      <a href="download-de.html">Details</a>', `
      <a href="download.html">Details</a>')
      &middot;
      m4_ifelse(LANG_DE, `1', `
      <a href="change-history-de.html">Änderungshistorie</a>', `
      <a href="change-history.html">Change History</a>')
      &middot;
      m4_ifelse(LANG_DE, `1', `
      <a href="package-integrity-de.html">Integrität prüfen</a>', `
      <a href="package-integrity.html">Check integrity</a>')
    </div>
    <br/>
-<!--
    <div id="download_button_mini">
      m4_ifelse(LANG_DE, `1', `
-     <a class="dmini_button" href="version3.1-de.html">
+     <a class="dmini_button" href="version3.1.3-de.html">
      <span class="text">
       Try BETA_VERSION
      </span></a>', `
-     <a class="dmini_button" href="version3.1.html">
+     <a class="dmini_button" href="version3.1.3.html">
      <span class="text">
       Try BETA_VERSION
      </span></a>')
    </div>
--->
    <div class="h_text_beta">
    <p><span class="heading">News</span></p>
    <small>2018-06-17</small><br>
    <span class="serif_word"><img src="img/bulletin.png" alt"" />
      m4_ifelse(LANG_DE, `1', `
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-June/000043.html">Gpg4win 3.1.2 veröffentlicht
       </a></span>',`
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-June/000079.html">
         Gpg4win 3.1.2 released
       </a></span>')
    <p></p>
    <small>2018-05-17</small><br>
    <span class="serif_word"><img src="img/bulletin.png" alt"" />
      m4_ifelse(LANG_DE, `1', `
       <a href="statement-efail.html">Stellungnahme zu Efail (en)
       </a></span>',`
       <a href="statement-efail.html">Statement on Efail
       </a></span>')
    <p></p>
    <div class="limiter"></div>
    <p>
      m4_ifelse(LANG_DE, `1', `
      Ältere Meldungen im <a href="newsarchive-de.html">Newsarchiv</a>.', `
      Older messages in <a href="newsarchive.html">news archive</a>.')
     </p>
    </div>
   </div>', `
   <div class="mini_intro">
    <div id="breadcrum">m4_ifelse(LANG_DE, `1', `<a href="index-de.html">', `<a
    href="index.html">')Home</a> &raquo;
    m4_ifelse(LANG_DE, `1', `
    m4_ifelse(MAIN, `about', `Über Gpg4win')
    m4_ifelse(MAIN, `doc', `Dokumentation')
    m4_ifelse(MAIN, `community', `Gemeinschaft')
    m4_ifelse(MAIN, `support', `Support')
    m4_ifelse(MAIN, `download', `Download')
    m4_ifelse(MAIN, `donate', `Spenden')
    ')
    m4_ifelse(LANG_DE, `0', `
    m4_ifelse(MAIN, `about', `About Gpg4win')
    m4_ifelse(MAIN, `doc', `Documentation')
    m4_ifelse(MAIN, `community', `Community')
    m4_ifelse(MAIN, `support', `Support')
    m4_ifelse(MAIN, `download', `Download')
    m4_ifelse(MAIN, `donate', `Donate')
    ')
    </div>
    </div><br clear="all" />
   ')
diff --git a/web/version3.1.3-de.htm4 b/web/version3.1.3-de.htm4
new file mode 100644
index 00000000..2c391d9e
--- /dev/null
+++ b/web/version3.1.3-de.htm4
@@ -0,0 +1,92 @@
+m4_dnl                                                            -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `version3.1.3.html')
+
+m4_define(`TITLE', `Was ist neu in Version 3.1.3')
+m4_define(`MAIN', `version3.1.3')
+
+PAGE_START
+
+<div id="intro">
+<h2>Was kommt mit Gpg4win 3.1.3?</h2>
+</div>
+<div id="main">
+
+<br/>
+m4_ifelse(LANG_DE, `1',
+Gpg4win 3.1.3 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
+ausprobieren und Probleme in unserem
+<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
+Gpg4win 3.1.3 is currently in beta.<br/>You can help by trying it out and reporting issues in our
+<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
+
+<div id="download_button">
+    m4_ifelse(LANG_DE, `1', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+    <span class="text">
+        Download<br/>Gpg4win<br/>BETA_VERSION
+    </span></a>', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+        <span class="text">
+            Download<br/>Gpg4win<br/>BETA_VERSION
+        </span></a>')
+</div>
+<div class="download_button_links">
+    m4_ifelse(LANG_DE, `1', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signatur</a>', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signature</a>')
+</div>
+<br/>
+<br/>
+<br/>
+<br/>
+
+m4_ifelse(LANG_DE, `1', `
+<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/README-BETA_VERSION.de.txt">
+    Weitere Details und Änderungen in der Readme</a>', `
+<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/README-BETA_VERSION.en.txt">
+    More details and changes in the Readme
+</a>')
+<br/>
+
+<h2>Outlook Plugin (GpgOL)</h2>
+
+<ul>
+    <li>
+    Krypto-Mails können nun wie normale Mails verschoben werden.
+    </li>
+    <li>
+    Nachrichten können automatisch verschlüsselt werden wenn Schlüssel verfügbar sind.
+    </li>
+    <li>
+    Outlook friert nicht länger ein während verschlüsselt wird.
+    <ul>
+        <li>Achtung: Bei manchen Nutzern führt dies dazu das Outlook
+            beim mailversand abstürzt. In diesem Fall können Sie "Disable non-blocking encrypt / sign"
+            in den Optionen aktivieren.
+            <br/>
+            <br/>
+            Es würde uns helfen wenn Sie dann
+            im entsprechenden Task <a href="https://dev.gnupg.org/T3838">T3838</a> eine Notiz
+            hinterlassen.
+        </li>
+    </ul>
+    </li>
+    <li>
+    Größere interne Änderungen um die Stabilität weiter zu verbessern.
+    </li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/wkd-en.gif">Automatische Verschlüsselung unter
+Verwendung eines <a href="https://wiki.gnupg.org/WKD">Web Key Directory.</a></img>
+
+<h2>Krypto-Manager (Kleopatra)</h2>
+<ul>
+    <li>Neue Text basierte Krypto Ansicht.</li>
+    <li>Unterstützung für Heimatverzeichnisse im Netzwerk.</li>
+    <li>Mehrere Stabilitätsverbesserungen.</li>
+</ul>
+</div>
diff --git a/web/version3.1.3.htm4 b/web/version3.1.3.htm4
new file mode 100644
index 00000000..e70327c6
--- /dev/null
+++ b/web/version3.1.3.htm4
@@ -0,0 +1,90 @@
+m4_dnl                                                            -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `version3.1.3-de.html')
+
+m4_define(`TITLE', `What's new - Version 3.1.3')
+m4_define(`MAIN', `version3.1.3')
+
+PAGE_START
+
+<div id="intro">
+<h2>What's coming with Gpg4win 3.1.3?</h2>
+</div>
+
+<div id="main">
+
+m4_ifelse(LANG_DE, `1',
+Gpg4win 3.1.3 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
+ausprobieren und Probleme in unserem
+<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
+Gpg4win 3.1.3 is currently in beta.<br/>You can help by trying it out and reporting issues in our
+<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
+
+<div id="download_button">
+    m4_ifelse(LANG_DE, `1', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+    <span class="text">
+        Download<br/>Gpg4win<br/>BETA_VERSION
+    </span></a>', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+        <span class="text">
+            Download<br/>Gpg4win<br/>BETA_VERSION
+        </span></a>')
+</div>
+<div class="download_button_links">
+    m4_ifelse(LANG_DE, `1', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signatur</a>', `
+    <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signature</a>')
+</div>
+<br/>
+<br/>
+<br/>
+<br/>
+
+m4_ifelse(LANG_DE, `1', `
+<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/README-BETA_VERSION.de.txt">
+    Weitere Details und Änderungen in der Readme</a>', `
+<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/README-BETA_VERSION.en.txt">
+    More details and changes in the Readme
+</a>')
+
+<br/>
+
+<h2>Outlook Plugin (GpgOL)</h2>
+
+<ul>
+    <li>
+    Crypto mails can now be moved like any other mails.
+    </li>
+    <li>
+    Mails can be automatically secured if pubkeys are available.
+    </li>
+    <li>
+    Outlook no longer freezes in the background when encrypting.
+    <ul>
+        <li><b>Note:</b>There are reports that for some users this causes sending crypto mails to
+            crash. In that case you can "Disable non-blocking encrypt / sign" in the options.
+            <br/>
+            It would help if you would also add a note that you are affected in the task for this:
+            <a href="https://dev.gnupg.org/T3838">T3838</a>.
+        </li>
+    </ul>
+    </li>
+    <li>
+    Major internal changes to further improve stability.
+    </li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/wkd-en.gif">Automatic encryption utilizing a
+<a href="https://wiki.gnupg.org/WKD">Web Key Directory.</a></img>
+
+<h2>Crypto-Manager (Kleopatra)</h2>
+<ul>
+    <li>Diagnostic support in case of file crypto errors.</li>
+    <li>Fixed encoding of GnuPG command output.</li>
+    <li>Various minor improvements.</li>
+</ul>
+</div>
diff --git a/web/versions.m4 b/web/versions.m4
index b6e48c68..86dbf82b 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -1,43 +1,43 @@
 m4_define(`VERSION',`3.1.2')
 m4_define(`DL_DATE',`2018-06-17')
 m4_define(`DOWNLOAD_URL',`https://files.gpg4win.org/gpg4win-VERSION.exe')
 m4_define(`DL_SIZE',`27.5 MByte')
 m4_define(`SDOWNLOAD_URL',`https://files.gpg4win.org/gpg4win-VERSION.tar.bz2')
 m4_define(`SDL_SIZE',`5.3 MByte')
 
 m4_dnl Paste output of mk-chksums here
 
 m4_define(`SHA1_SRC',`e875d1ab4d8c3c960fdbdb00236d8da0a14ed07e')
 m4_define(`SHA1_EXE',`01597cb2a0ff4a914717d603547906e3862b6382')
 m4_define(`SHA1_EXS',`0445037c401357ca463da39771c3bda7a79782d6')
 m4_define(`SHA2_SRC',`bb82b45fb33e399da9ae0c0883c8933c8fb3a1f952c16766b35a13d65e4ad839')
 m4_define(`SHA2_EXE',`6c7bbb36c89c83b2432edc9a7fe64c73b26711ca0d3d6a0d55c71aef66ec70f1')
 m4_define(`SHA2_EXS',`c8c80554149c6dad410461cc17447aa8115525ee003aafe6ace034da5a40970c')
 m4_define(`LEN_SRC',`5429731')
 m4_define(`LEN_EXE',`28219424')
 m4_define(`LEN_EXS',`228170480')
 
 m4_dnl end paste
 
 m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
 m4_define(`SOFTWAREOVERVIEW',`
 I18N(`EN', `<a href="https://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="https://www.gnupg.org/index.de.html">GnuPG</a>') 2.2.8
 <a href="https://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.1.2
 I18N(`EN', `<a href="https://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="https://www.gnupg.org/related_software/gpa/index.de.html">GPA</a>') 0.9.10
 <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 2.2.0
 <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.6
 <a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 4.0.1
 <a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
 ')
 
 m4_define(`COMPENDIUM_VERSION_DE',`4.0.1')
 m4_define(`COMPENDIUM_DATE_DE',`2018-04-03')
 m4_define(`DOWNLOAD_URL_COMPENDIUM_DE',`https://files.gpg4win.org/doc/gpg4win-compendium-de.pdf')
 m4_define(`DL_SIZE_COMPENDIUM_DE',`3 MByte')
 m4_define(`COMPENDIUM_VERSION_EN',`3.0.0')
 m4_define(`COMPENDIUM_DATE_EN',`2016-11-30')
 m4_define(`DOWNLOAD_URL_COMPENDIUM_EN',`https://files.gpg4win.org/doc/gpg4win-compendium-en.pdf')
 m4_define(`DL_SIZE_COMPENDIUM_EN',`3 MByte')
 
-m4_dnl m4_define(`BETA_VERSION', `3.1.0-beta48')
-m4_dnl m4_define(`BETA_SIZE', `27 MByte')
+m4_define(`BETA_VERSION', `3.1.3-beta20')
+m4_define(`BETA_SIZE', `27 MByte')