diff --git a/src/site/markdown/httpcomponents-core-5.1.x/examples.md b/src/site/markdown/httpcomponents-core-5.1.x/examples.md
index 7811a03..025b1b9 100644
--- a/src/site/markdown/httpcomponents-core-5.1.x/examples.md
+++ b/src/site/markdown/httpcomponents-core-5.1.x/examples.md
@@ -20,73 +20,73 @@
 HttpCore Examples
 =================
 
-- [ Classic (blocking) HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java)
+- [ Classic (blocking) HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java)
 
   This example demonstrates synchronous execution of multiple HTTP/1.1 GET requests.
 
-- [ Classic (blocking) HTTP/1.1 POST requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java)
+- [ Classic (blocking) HTTP/1.1 POST requests](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java)
 
   This example demonstrates synchronous execution of multiple HTTP/1.1 POST requests with enclosed content of various
   types.
 
-- [ Asynchronous HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java)
+- [ Asynchronous HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java)
 
   This example demonstrates asynchronous execution of multiple HTTP/1.1 requests.
 
-- [ Asynchronous HTTP/2 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java)
+- [ Asynchronous HTTP/2 GET requests](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java)
 
   This example demonstrates asynchronous execution of multiple HTTP/2 requests.
 
-- [ HTTP/2 requests over TLS connections with ALPN support](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java)
+- [ HTTP/2 requests over TLS connections with ALPN support](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java)
 
   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.
 
-- [ HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java 1.8](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java)
+- [ HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java 1.8](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java)
 
   This example demonstrates how to execute HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java
   1.8.
 
-- [ Asynchronous HTTP/1.1 GET requests with message pipelining](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java)
+- [ Asynchronous HTTP/1.1 GET requests with message pipelining](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java)
 
   This example demonstrates asynchronous, pipelined execution multiple HTTP/1.1 requests.
 
-- [ Asynchronous HTTP/2 GET requests with multiple concurrent streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java)
+- [ Asynchronous HTTP/2 GET requests with multiple concurrent streams](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java)
 
   This example demonstrates asynchronous, multistream execution of multiple HTTP/2 requests.
 
-- [ Classic (blocking) HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java)
+- [ Classic (blocking) HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java)
 
   This is an example of an embedded HTTP/1.1 file server with a classic (blocking) message transport.
 
-- [ Request filters with classic (blocking) HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicServerFilterExample.java)
+- [ Request filters with classic (blocking) HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicServerFilterExample.java)
 
   This is an example of using synchronous request filters with an embedded HTTP/1.1 server.
 
-- [ Asynchronous HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncFileServerExample.java)
+- [ Asynchronous HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncFileServerExample.java)
 
   This is an example of an embedded HTTP/1.1 file server with an event driven, non-blocking message transport.
 
-- [ Request filters with asynchronous HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java)
+- [ Request filters with asynchronous HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java)
 
   This is an example of using asynchronous request filters with an embedded HTTP/1.1 server.
 
-- [ Asynchronous HTTP/2 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2FileServerExample.java)
+- [ Asynchronous HTTP/2 file server](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2FileServerExample.java)
 
   This is an example of an embedded HTTP/2 file server with an event driven, non-blocking message transport.
 
-- [ Classic (blocking) HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicReverseProxyExample.java)
+- [ Classic (blocking) HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicReverseProxyExample.java)
 
   This is an example of an embedded HTTP/1.1 reverse proxy with a classic (blocking) message transport.
 
-- [ Asynchronous HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncReverseProxyExample.java)
+- [ Asynchronous HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncReverseProxyExample.java)
 
   This is an example of an embedded HTTP/1.1 reverse proxy with an event driven, non-blocking message transport.
 
-- [ Client Reactive Streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexClientExample.java)
+- [ Client Reactive Streams](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexClientExample.java)
 
   This is an example of full-duplex HTTP/1.1 client side message exchanges using reactive streaming.
 
-- [ Server Reactive Streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexServerExample.java)
+- [ Server Reactive Streams](https://github.com/apache/httpcomponents-core/tree/5.1.x/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexServerExample.java)
 
   This is an example of full-duplex HTTP/1.1 server side message exchanges using reactive streaming.
diff --git a/src/site/markdown/httpcomponents-core-5.0.x/related-projects.md b/src/site/markdown/httpcomponents-core-5.1.x/related-projects.md
similarity index 100%
rename from src/site/markdown/httpcomponents-core-5.0.x/related-projects.md
rename to src/site/markdown/httpcomponents-core-5.1.x/related-projects.md
diff --git a/src/site/markdown/httpcomponents-core-5.0.x/download.md b/src/site/markdown/httpcomponents-core-5.2.x/download.md
similarity index 98%
rename from src/site/markdown/httpcomponents-core-5.0.x/download.md
rename to src/site/markdown/httpcomponents-core-5.2.x/download.md
index b95e579..972b65a 100644
--- a/src/site/markdown/httpcomponents-core-5.0.x/download.md
+++ b/src/site/markdown/httpcomponents-core-5.2.x/download.md
@@ -23,7 +23,7 @@
 The latest release available for download:
 
 [Release packages](http://hc.apache.org/downloads.cgi) -
-[Release Notes](http://www.apache.org/dist/httpcomponents/httpcore/RELEASE_NOTES-5.0.x.txt) -
+[Release Notes](http://www.apache.org/dist/httpcomponents/httpcore/RELEASE_NOTES-5.2.x.txt) -
 [License](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 Dependency management
diff --git a/src/site/markdown/httpcomponents-core-5.0.x/examples.md b/src/site/markdown/httpcomponents-core-5.2.x/examples.md
similarity index 63%
rename from src/site/markdown/httpcomponents-core-5.0.x/examples.md
rename to src/site/markdown/httpcomponents-core-5.2.x/examples.md
index cc50ce7..7811a03 100644
--- a/src/site/markdown/httpcomponents-core-5.0.x/examples.md
+++ b/src/site/markdown/httpcomponents-core-5.2.x/examples.md
@@ -20,73 +20,73 @@
 HttpCore Examples
 =================
 
-- [ Classic (blocking) HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java)
+- [ Classic (blocking) HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java)
 
   This example demonstrates synchronous execution of multiple HTTP/1.1 GET requests.
 
-- [ Classic (blocking) HTTP/1.1 POST requests](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java)
+- [ Classic (blocking) HTTP/1.1 POST requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java)
 
   This example demonstrates synchronous execution of multiple HTTP/1.1 POST requests with enclosed content of various
   types.
 
-- [ Asynchronous HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java)
+- [ Asynchronous HTTP/1.1 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java)
 
   This example demonstrates asynchronous execution of multiple HTTP/1.1 requests.
 
-- [ Asynchronous HTTP/2 GET requests](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java)
+- [ Asynchronous HTTP/2 GET requests](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java)
 
   This example demonstrates asynchronous execution of multiple HTTP/2 requests.
 
-- [ HTTP/2 requests over TLS connections with ALPN support](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java)
+- [ HTTP/2 requests over TLS connections with ALPN support](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java)
 
   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.
 
-- [ HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java 1.8](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java)
+- [ HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java 1.8](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java)
 
   This example demonstrates how to execute HTTP/2 requests over TLS connections with ALPN support on Java 1.7 and Java
   1.8.
 
-- [ Asynchronous HTTP/1.1 GET requests with message pipelining](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java)
+- [ Asynchronous HTTP/1.1 GET requests with message pipelining](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java)
 
   This example demonstrates asynchronous, pipelined execution multiple HTTP/1.1 requests.
 
-- [ Asynchronous HTTP/2 GET requests with multiple concurrent streams](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java)
+- [ Asynchronous HTTP/2 GET requests with multiple concurrent streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java)
 
   This example demonstrates asynchronous, multistream execution of multiple HTTP/2 requests.
 
-- [ Classic (blocking) HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java)
+- [ Classic (blocking) HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java)
 
   This is an example of an embedded HTTP/1.1 file server with a classic (blocking) message transport.
 
-- [ Request filters with classic (blocking) HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicServerFilterExample.java)
+- [ Request filters with classic (blocking) HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicServerFilterExample.java)
 
   This is an example of using synchronous request filters with an embedded HTTP/1.1 server.
 
-- [ Asynchronous HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncFileServerExample.java)
+- [ Asynchronous HTTP/1.1 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncFileServerExample.java)
 
   This is an example of an embedded HTTP/1.1 file server with an event driven, non-blocking message transport.
 
-- [ Request filters with asynchronous HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java)
+- [ Request filters with asynchronous HTTP/1.1 server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java)
 
   This is an example of using asynchronous request filters with an embedded HTTP/1.1 server.
 
-- [ Asynchronous HTTP/2 file server](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2FileServerExample.java)
+- [ Asynchronous HTTP/2 file server](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2FileServerExample.java)
 
   This is an example of an embedded HTTP/2 file server with an event driven, non-blocking message transport.
 
-- [ Classic (blocking) HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicReverseProxyExample.java)
+- [ Classic (blocking) HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicReverseProxyExample.java)
 
   This is an example of an embedded HTTP/1.1 reverse proxy with a classic (blocking) message transport.
 
-- [ Asynchronous HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncReverseProxyExample.java)
+- [ Asynchronous HTTP reverse proxy](https://github.com/apache/httpcomponents-core/tree/master/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncReverseProxyExample.java)
 
   This is an example of an embedded HTTP/1.1 reverse proxy with an event driven, non-blocking message transport.
 
-- [ Client Reactive Streams](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexClientExample.java)
+- [ Client Reactive Streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexClientExample.java)
 
   This is an example of full-duplex HTTP/1.1 client side message exchanges using reactive streaming.
 
-- [ Server Reactive Streams](https://github.com/apache/httpcomponents-core/tree/5.0.x/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexServerExample.java)
+- [ Server Reactive Streams](https://github.com/apache/httpcomponents-core/tree/master/httpcore5-reactive/src/test/java/org/apache/hc/core5/reactive/examples/ReactiveFullDuplexServerExample.java)
 
   This is an example of full-duplex HTTP/1.1 server side message exchanges using reactive streaming.
diff --git a/src/site/markdown/httpcomponents-core-5.0.x/index.md b/src/site/markdown/httpcomponents-core-5.2.x/index.md
similarity index 100%
rename from src/site/markdown/httpcomponents-core-5.0.x/index.md
rename to src/site/markdown/httpcomponents-core-5.2.x/index.md
diff --git a/src/site/markdown/news.md b/src/site/markdown/news.md
index 87164fc..9afb7b2 100644
--- a/src/site/markdown/news.md
+++ b/src/site/markdown/news.md
@@ -20,6 +20,17 @@
 HttpComponents Project News
 ===========================
 
+###### 15 March 2021 - HttpComponents Core 5.1 (GA) released
+
+This is the first GA release in the 5.1 release series.
+
+Notable changes and features included in the 5.1 series:
+
+- Conditional conformance with RFC 3986 (Uniform Resource Identifier (URI): Generic Syntax).
+- Improved support for out of sequence response message handing by the the classic (blocking)
+  HTTP transport.
+- Improved message builders.
+
 ###### 12 February 2021 - HttpComponents Client 5.1-beta1 released
 
 This is the first BETA release in the 5.1 release series that includes a number of new features as well performance
@@ -35,11 +46,6 @@
 This is likely the last BETA release in the 5.1 release series. The next release is expected to be 5.1 GA. This beta
 includes a number of new features as well as bug fixes from the stable 5.0.x branch.
 
-Notable changes and features included in the 5.1 series:
-
-- Conditional conformance with RFC 3986 (Uniform Resource Identifier (URI): Generic Syntax).
-- Improved support for out of sequence response message handing by the classic (blocking) HTTP transport.
-
 ###### 3 December 2020 - HttpComponents Core 5.1-beta2 released
 
 This is the second BETA release in the 5.1 release series that includes a number of new features as well as bug fixes
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index c1bd396..8279672 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -1,6 +1,6 @@
 Redirect permanent  "/httpclient-3.x"                  "/httpclient-legacy"
 Redirect permanent  "/httpcomponents-asyncclient-ga"   "/httpcomponents-asyncclient-4.1.x"
-Redirect temp       "/httpcomponents-core-ga"          "/httpcomponents-core-5.0.x"
+Redirect temp       "/httpcomponents-core-ga"          "/httpcomponents-core-5.1.x"
 Redirect temp       "/httpcomponents-client-ga"        "/httpcomponents-client-5.0.x"
 Redirect temp       "/httpcomponents-core-dev"         "/httpcomponents-core-5.1.x"
 Redirect temp       "/httpcomponents-client-dev"       "/httpcomponents-client-5.1.x"
diff --git a/src/site/resources/documentation.links b/src/site/resources/documentation.links
index f92c355..20eb64d 100644
--- a/src/site/resources/documentation.links
+++ b/src/site/resources/documentation.links
@@ -3,8 +3,3 @@
 
 httpclient-3.x                  ./components/httpclient-legacy
 httpclient-legacy               ./components/httpclient-legacy
-httpcomponents-asyncclient-ga   ./httpcomponents-asyncclient-4.1.x
-httpcomponents-core-ga          ./httpcomponents-core-5.0.x
-httpcomponents-client-ga        ./httpcomponents-client-5.0.x
-httpcomponents-core-dev         ./httpcomponents-core-5.1.x
-httpcomponents-client-dev       ./httpcomponents-client-5.1.x
diff --git a/src/site/resources/httpcomponents-core-5.0.x/documentation.links b/src/site/resources/httpcomponents-core-5.0.x/documentation.links
deleted file mode 100644
index b770af3..0000000
--- a/src/site/resources/httpcomponents-core-5.0.x/documentation.links
+++ /dev/null
@@ -1,5 +0,0 @@
-# links property file for Ant's symlink task in pom.xml:
-# links to components in http://hc.apache.org/components/
-
-5.0.3       ../components/httpcomponents-core-5.0.x/5.0.3
-current     ../components/httpcomponents-core-5.0.x/5.0.3
diff --git a/src/site/resources/httpcomponents-core-5.1.x/documentation.links b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
index 17f959a..0675cf1 100644
--- a/src/site/resources/httpcomponents-core-5.1.x/documentation.links
+++ b/src/site/resources/httpcomponents-core-5.1.x/documentation.links
@@ -2,4 +2,5 @@
 # links to components in http://hc.apache.org/components/
 
 5.1-beta3   ../components/httpcomponents-core-5.1.x/5.1-beta3
-current     ../components/httpcomponents-core-5.1.x/5.1-beta3
+5.1         ../components/httpcomponents-core-5.1.x/5.1
+current     ../components/httpcomponents-core-5.1.x/5.1
diff --git a/src/site/site.xml b/src/site/site.xml
index f40ba3c..8e2fa32 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -97,16 +97,11 @@
         <item name="Related" href="httpcomponents-client-5.0.x/related-projects.html"/>
         <item name="Download" href="httpcomponents-client-5.0.x/download.html"/>
       </item>
-      <item name="HttpCore 5.1 BETA" collapse="true" href="httpcomponents-core-5.1.x/index.html">
+      <item name="HttpCore 5.1" collapse="true" href="httpcomponents-core-5.1.x/index.html">
         <item name="Examples" href="httpcomponents-core-5.1.x/examples.html"/>
-        <item name="Related" href="httpcomponents-core-5.0.x/related-projects.html"/>
+        <item name="Related" href="httpcomponents-core-5.1.x/related-projects.html"/>
         <item name="Download" href="httpcomponents-core-5.1.x/download.html"/>
       </item>
-      <item name="HttpCore 5.0" collapse="true" href="httpcomponents-core-5.0.x/index.html">
-        <item name="Examples" href="httpcomponents-core-5.0.x/examples.html"/>
-        <item name="Related" href="httpcomponents-core-5.0.x/related-projects.html"/>
-        <item name="Download" href="httpcomponents-core-5.0.x/download.html"/>
-      </item>
       <item name="HttpClient 4.5" collapse="true" href="httpcomponents-client-4.5.x/index.html">
         <item name="Quick Start" href="httpcomponents-client-4.5.x/quickstart.html"/>
         <item name="Tutorial" href="httpcomponents-client-4.5.x/current/tutorial/html/index.html"/>
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 2c503b5..e529c34 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -96,43 +96,43 @@
       </ul>
     </subsection>
 
-    <subsection name="HttpCore 5.0.3 (GA)">
+    <subsection name="HttpCore 5.1 (GA)">
       <a href="https://downloads.apache.org/httpcomponents/httpcore/KEYS">KEYS</a>
-      <a href="https://downloads.apache.org/httpcomponents/httpcore/RELEASE_NOTES-5.0.3.x.txt">Release Notes</a>
+      <a href="https://downloads.apache.org/httpcomponents/httpcore/RELEASE_NOTES-5.1.x.txt">Release Notes</a>
       <br/>
       <p>Binary</p>
       <ul>
         <li>
-          <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.tar.gz">5.0.3.tar.gz</a>
+          <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.tar.gz">5.1.tar.gz</a>
           [<a
-            href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.tar.gz.sha512">
+            href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.tar.gz.sha512">
           sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.tar.gz.asc">
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.tar.gz.asc">
           pgp</a>]
         </li>
         <li>
-          <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.zip">5.0.3.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.zip.sha512">
+          <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.zip">5.1.zip</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.zip.sha512">
           sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.0.3-bin.zip.asc">
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-bin.zip.asc">
           pgp</a>]
         </li>
       </ul>
       <p>Source</p>
       <ul>
         <li>
-          <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.tar.gz">5.0.3.tar.gz</a>
+          <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.tar.gz">5.1.tar.gz</a>
           [<a
-            href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.tar.gz.sha512">
+            href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.tar.gz.sha512">
           sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.tar.gz.asc">
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.tar.gz.asc">
           pgp</a>]
         </li>
         <li>
-          <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.zip">5.0.3.zip</a>
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.zip.sha512">
+          <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.zip">5.1.zip</a>
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.zip.sha512">
           sha512</a>]
-          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.0.3-src.zip.asc">
+          [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-src.zip.asc">
           pgp</a>]
         </li>
       </ul>
@@ -268,48 +268,6 @@
       </ul>
     </subsection>
 
-    <subsection name="HttpCore 5.1 BETA3">
-    <a href="https://downloads.apache.org/httpcomponents/httpcore/KEYS">KEYS</a>
-    <a href="https://downloads.apache.org/httpcomponents/httpcore/RELEASE_NOTES-5.1.x.txt">Release Notes</a>
-    <br/>
-    <p>Binary</p>
-    <ul>
-      <li>
-        <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.tar.gz">5.1-beta3.tar.gz</a>
-        [<a
-          href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.tar.gz.sha512">
-        sha512</a>]
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.tar.gz.asc">
-        pgp</a>]
-      </li>
-      <li>
-        <a href="[preferred]/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.zip">5.1-beta3.zip</a>
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.zip.sha512">
-        sha512</a>]
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/binary/httpcomponents-core-5.1-beta3-bin.zip.asc">
-        pgp</a>]
-      </li>
-    </ul>
-    <p>Source</p>
-    <ul>
-      <li>
-        <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.tar.gz">5.1-beta3.tar.gz</a>
-        [<a
-          href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.tar.gz.sha512">
-        sha512</a>]
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.tar.gz.asc">
-        pgp</a>]
-      </li>
-      <li>
-        <a href="[preferred]/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.zip">5.1-beta3.zip</a>
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.zip.sha512">
-        sha512</a>]
-        [<a href="https://downloads.apache.org/httpcomponents/httpcore/source/httpcomponents-core-5.1-beta3-src.zip.asc">
-        pgp</a>]
-      </li>
-    </ul>
-  </subsection>
-    
   <subsection name="Older releases">
     <p>
     Old releases are available from the