diff --git a/src/site/apt/httpcomponents-core-5.0.x/examples.apt b/src/site/apt/httpcomponents-core-5.0.x/examples.apt
index 37a8707..4cfdbf0 100644
--- a/src/site/apt/httpcomponents-core-5.0.x/examples.apt
+++ b/src/site/apt/httpcomponents-core-5.0.x/examples.apt
@@ -46,19 +46,19 @@
     
     This example demonstrates asynchronous execution of multiple HTTP/1.1 requests.
 
-    * {{{./httpcore5-h2/examples/Http2RequestExecutionExample.java} 
+    * {{{./httpcore5-h2/examples/H2RequestExecutionExample.java}
     Asynchronous HTTP/2 GET requests}}
     
     This example demonstrates asynchronous execution of multiple HTTP/2 requests.
 
-    * {{{./httpcore5-h2/examples/Http2TlsAlpnRequestExecutionExample.java}
+    * {{{./httpcore5-h2/examples/H2TlsAlpnRequestExecutionExample.java}
     HTTP/2 requests over TLS connections with ALPN support}}
 
     This example demonstrates how to execute HTTP/2 requests over TLS connections with ALPN support.
     It also explains how to avoid the illegal reflective access operation warning when running
     Java 9 or older.
 
-    * {{{./httpcore5-h2/examples/Http2ConscriptRequestExecutionExample.java}
+    * {{{./httpcore5-h2/examples/H2ConscriptRequestExecutionExample.java}
     HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java 1.8}}
 
     This example demonstrates how to execute HTTP/2 requests over TLS connections with ALPN support
@@ -69,7 +69,7 @@
     
     This example demonstrates asynchronous, pipelined execution multiple HTTP/1.1 requests.
 
-    * {{{./httpcore5-h2/examples/Http2MultiStreamExecutionExample.java} 
+    * {{{./httpcore5-h2/examples/H2MultiStreamExecutionExample.java}
     Asynchronous HTTP/2 GET requests with multiple concurrent streams}}
     
     This example demonstrates asynchronous, multistream execution of multiple HTTP/2 requests.
@@ -94,7 +94,7 @@
 
     This is an example of using asynchronous request filters with an embedded HTTP/1.1 server.
 
-    * {{{./httpcore5-h2/examples/Http2FileServerExample.java} 
+    * {{{./httpcore5-h2/examples/H2FileServerExample.java}
     Asynchronous HTTP/2 file server}}
     
     This is an example of an embedded HTTP/2 file server with an event driven, non-blocking message transport.
diff --git a/src/site/apt/news.apt b/src/site/apt/news.apt
index 3d2c929..6b1b64a 100644
--- a/src/site/apt/news.apt
+++ b/src/site/apt/news.apt
@@ -30,6 +30,79 @@
 
 HttpComponents Project News
 
+* 15 July 2019 - HttpComponents HttpCore 5.0-beta8 released
+
+    This BETA fixes a number of defects found since the last release and adds several
+    convenience factory and builder classes, mainly for TLS configuration and HTTP
+    message construction.
+
+    Notable new features in this release:
+
+    * As of this version all server and requester implementations exclude weak TLS protocol
+    versions and ciphers.
+
+    []
+
+    Notable changes and features included in the 5.0 series are:
+
+    * Support for HTTP/2 protocol and conformance to requirements and recommendations
+      of the latest HTTP/2 protocol specification (RFC 7540, RFC 7541)
+
+    Supported features:
+
+        * HPACK header compression
+
+        * stream multiplexing (client and server)
+
+        * flow control
+
+        * response push (client and server)
+
+        * message trailers
+
+        * expect-continue handshake
+
+        * connection validation (ping)
+
+        * application-layer protocol negotiation (ALPN) on Java 9+ or through Conscrypt TLS library
+          on Java 1.7 and Java 1.8.
+
+        * TLS 1.2 security features
+
+    Features out of scope for 5.0 release:
+
+        * padding of outgoing frames
+
+        * stream priority
+
+        * plain connection HTTP/1.1 upgrade
+
+        * CONNECT method
+
+    * Improved conformance to requirements and recommendations of the latest HTTP/1.1 protocol
+      specification (RFC 7230, RFC 7231)
+
+    * New asynchronous HTTP transport APIs consistent for both HTTP/1.1 and HTTP/2 transport.
+
+    * Redesigned I/O reactor APIs and improved NIO based reactor implementation for a greater
+      performance and scalability.
+
+    * Support for server side request filters for classic and asynchronous server implementations.
+      Request filters could be used to implement cross-cutting protocol aspects such
+      as the 'expect-continue' handshaking and user authentication / authorization.
+
+    * Redesigned connection pool implementation with strict connection limit guarantees.
+      The connection pool is expected to have a better performance under higher concurrency
+      due to reduced global pool lock contention.
+
+    * New connection pool implementation with lax connection limit guarantees and better
+      performance under higher concurrency due to absence of a global pool lock.
+
+    * Package name space changed to 'org.apache.hc.core5'
+
+    * Maven group id changed to 'org.apache.httpcomponents.core5'
+
+
 * 12 June 2019 - HttpComponents HttpClient 4.5.9 (GA) released
 
     This is a maintenance release that fixes a number defects discovered since 4.5.8.
@@ -101,68 +174,6 @@
 
     * Improved TLS handshake timeout configuration
 
-    []
-
-    Notable changes and features included in the 5.0 series are:
-
-    * Support for HTTP/2 protocol and conformance to requirements and recommendations
-      of the latest HTTP/2 protocol specification (RFC 7540, RFC 7541)
-
-    Supported features:
-
-        * HPACK header compression
-
-        * stream multiplexing (client and server)
-
-        * flow control
-
-        * response push (client and server)
-
-        * message trailers
-
-        * expect-continue handshake
-
-        * connection validation (ping)
-
-        * application-layer protocol negotiation (ALPN) on Java 9+ or through Conscrypt TLS library
-          on Java 1.7 and Java 1.8.
-
-        * TLS 1.2 security features
-
-    Features out of scope for 5.0 release:
-
-        * padding of outgoing frames
-
-        * stream priority
-
-        * plain connection HTTP/1.1 upgrade
-
-        * CONNECT method
-
-    * Improved conformance to requirements and recommendations of the latest HTTP/1.1 protocol
-      specification (RFC 7230, RFC 7231)
-
-    * New asynchronous HTTP transport APIs consistent for both HTTP/1.1 and HTTP/2 transport.
-
-    * Redesigned I/O reactor APIs and improved NIO based reactor implementation for a greater
-      performance and scalability.
-
-    * Support for server side request filters for classic and asynchronous server implementations.
-      Request filters could be used to implement cross-cutting protocol aspects such
-      as the 'expect-continue' handshaking and user authentication / authorization.
-
-    * Redesigned connection pool implementation with strict connection limit guarantees.
-      The connection pool is expected to have a better performance under higher concurrency
-      due to reduced global pool lock contention.
-
-    * New connection pool implementation with lax connection limit guarantees and better
-      performance under higher concurrency due to absence of a global pool lock.
-
-    * Package name space changed to 'org.apache.hc.core5'
-
-    * Maven group id changed to 'org.apache.httpcomponents.core5'
-
-
 *  24 January 2019 - HttpComponents HttpClient 4.5.7 (GA) released
 
     This is a maintenance release that corrects Automatic-Module-Name definitions added in
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 9f1304e..d258f1d 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -162,34 +162,34 @@
     </ul>
   </subsection>
 
-  <subsection name="HttpCore 5.0-beta7">
+  <subsection name="HttpCore 5.0-beta8">
     <a href="https://www.apache.org/dist/httpcomponents/httpcore/KEYS">KEYS</a>
     <a href="https://www.apache.org/dist/httpcomponents/httpcore/RELEASE_NOTES-5.0.x.txt">Release Notes</a>
     <br/>
     <p>Binary</p>
     <ul>
      <li>
-       <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.tar.gz">5.0-beta7.tar.gz</a>
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.tar.gz.sha512">sha512</a>]
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.tar.gz.asc">pgp</a>]
+       <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.tar.gz">5.0-beta8.tar.gz</a>
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.tar.gz.sha512">sha512</a>]
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.tar.gz.asc">pgp</a>]
      </li>
      <li>
-       <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.zip">5.0-beta7.zip</a>
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.zip.sha512">sha512</a>]
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta7-bin.zip.asc">pgp</a>]
+       <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.zip">5.0-beta8.zip</a>
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.zip.sha512">sha512</a>]
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-5.0-beta8-bin.zip.asc">pgp</a>]
      </li>
     </ul>
     <p>Source</p>
     <ul>
      <li>
-       <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.tar.gz">5.0-beta7.tar.gz</a>
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.tar.gz.sha512">sha512</a>]
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.tar.gz.asc">pgp</a>]
+       <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.tar.gz">5.0-beta8.tar.gz</a>
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.tar.gz.sha512">sha512</a>]
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.tar.gz.asc">pgp</a>]
      </li>
      <li>
-       <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.zip">5.0-beta7.zip</a>
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.zip.sha512">sha512</a>]
-       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta7-src.zip.asc">pgp</a>]
+       <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.zip">5.0-beta8.zip</a>
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.zip.sha512">sha512</a>]
+       [<a href="https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-5.0-beta8-src.zip.asc">pgp</a>]
      </li>
     </ul>
   </subsection>