diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index 17220d431..05700b450 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.httpcomponents.client5</groupId>
@@ -34,7 +34,6 @@
   <name>Apache HttpClient Cache</name>
   <inceptionYear>2010</inceptionYear>
   <description>Apache HttpComponents HttpClient Cache</description>
-  <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
   <packaging>jar</packaging>
 
   <properties>
@@ -127,6 +126,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
               <report>dependencies</report>
               <report>dependency-info</report>
               <report>summary</report>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 905c60951..62583ab13 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.httpcomponents.client5</groupId>
@@ -34,7 +34,6 @@
   <name>Apache HttpClient Fluent</name>
   <inceptionYear>2011</inceptionYear>
   <description>Apache HttpComponents Client Fluent</description>
-  <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
   <packaging>jar</packaging>
 
   <properties>
@@ -120,6 +119,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
               <report>dependencies</report>
               <report>dependency-info</report>
               <report>summary</report>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index b5ad5db65..4551dd49b 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.httpcomponents.client5</groupId>
@@ -33,7 +33,6 @@
   <artifactId>httpclient5-testing</artifactId>
   <name>Apache HttpClient Integration Tests</name>
   <description>Apache HttpClient integration tests</description>
-  <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
   <packaging>jar</packaging>
 
   <properties>
@@ -108,6 +107,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
               <report>dependencies</report>
               <report>dependency-info</report>
               <report>summary</report>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 7b53890be..60994c034 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.httpcomponents.client5</groupId>
@@ -33,7 +33,6 @@
   <artifactId>httpclient5-win</artifactId>
   <name>Apache HttpClient Windows features</name>
   <description>Apache HttpClient Windows specific functionality</description>
-  <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
   <packaging>jar</packaging>
 
   <properties>
@@ -89,6 +88,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
               <report>dependencies</report>
               <report>dependency-info</report>
               <report>summary</report>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index b57d152e7..fccd74c78 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.httpcomponents.client5</groupId>
@@ -33,7 +33,6 @@
   <artifactId>httpclient5</artifactId>
   <name>Apache HttpClient</name>
   <description>Apache HttpComponents Client</description>
-  <url>https://hc.apache.org/httpcomponents-client-5.0.x/</url>
   <packaging>jar</packaging>
 
   <properties>
@@ -166,6 +165,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>index</report>
               <report>dependencies</report>
               <report>dependency-info</report>
               <report>summary</report>
diff --git a/pom.xml b/pom.xml
index de94e5361..9d212718d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
    individuals on behalf of the Apache Software Foundation.  For more
    information on the Apache Software Foundation, please see
    <http://www.apache.org />.
- --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-parent</artifactId>
@@ -327,16 +327,40 @@
         <version>${hc.javadoc.version}</version>
         <configuration>
           <quiet>true</quiet>
+          <notimestamp>true</notimestamp>
           <links>
             <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
             <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
             <link>${project.url}/httpclient5/apidocs/</link>
           </links>
+          <groups>
+            <group>
+              <title>Apache HttpClient</title>
+              <packages>org.apache.hc.client5.http*</packages>
+            </group>
+            <group>
+              <title>Apache HttpClient Cache</title>
+              <packages>org.apache.hc.client5.http.cache*:org.apache.hc.client5.http.impl.cache*:org.apache.hc.client5.http.schedule:org.apache.hc.client5.http.impl.schedule*</packages>
+            </group>
+            <group>
+              <title>Apache HttpClient Fluent</title>
+              <packages>org.apache.hc.client5.http.fluent*</packages>
+            </group>
+            <group>
+              <title>Apache HttpClient Testing</title>
+              <packages>org.apache.hc.client5.testing*</packages>
+            </group>
+            <group>
+              <title>Apache HttpClient Windows features</title>
+              <packages>org.apache.hc.client5.http.impl.win*</packages>
+            </group>
+          </groups>
         </configuration>
         <reportSets>
           <reportSet>
             <reports>
               <report>javadoc</report>
+              <report>aggregate</report>
             </reports>
           </reportSet>
         </reportSets>
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
new file mode 100644
index 000000000..d233cf123
--- /dev/null
+++ b/src/site/resources/css/site.css
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ @import url("/css/hc-maven.css");
+ 
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 000000000..46ca40d81
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"
+    name="Apache HttpComponents Client">
+
+  <!-- N.B. all non-body elements are automatically inherited -->
+
+  <skin>
+    <groupId>org.apache.httpcomponents</groupId>
+    <artifactId>maven-site-skin</artifactId>
+    <version>1.1</version>
+  </skin>
+
+  <bannerLeft>
+    <name>Apache</name>
+    <src>http://www.apache.org/images/asf_logo_wide.gif</src>
+    <href>http://www.apache.org/</href>
+  </bannerLeft>
+
+  <bannerRight>
+    <name>HttpComponents</name>
+    <src>http://hc.apache.org/images/logos/httpcomponents.png</src>
+    <href>http://hc.apache.org/</href>
+  </bannerRight>
+
+  <body>
+    <!-- N.B. body links are automatically inherited -->
+    <links>
+      <item name="Apache" href="http://www.apache.org/"/>
+      <item name="HttpComponents" href="http://hc.apache.org/index.html"/>
+    </links>
+    
+    <!-- inherited -->
+    <menu ref="parent" inherit="bottom"/>
+    <menu ref="modules" inherit="bottom"/>
+    <menu ref="reports" inherit="bottom"/>
+
+    <menu name="ASF" inherit="bottom">
+      <item name="ASF Home Page" href="http://www.apache.org"/>
+      <item name="Foundation" href="http://www.apache.org/foundation/"/>
+      <item name="Sponsor Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+    </menu>
+  </body>
+  
+  <!-- inherited -->
+  <poweredBy>
+    <!-- Add ApacheCon logo -->
+    <logo name="ApacheCon" href="http://www.apache.org/events/current-event.html"
+          img="http://www.apache.org/events/current-event-125x125.png"/>
+    <!-- Keep the default logo as well -->
+    <logo name="Maven" href="http://maven.apache.org/"
+          img="http://maven.apache.org/images/logos/maven-feather.png"/>
+  </poweredBy>
+
+  <!-- inherited -->
+  <custom>
+    <footer>
+      <div class="xleft">Apache HttpComponents, Commons HttpClient, Apache, the Apache feather logo, and the Apache HttpComponents project logo are trademarks of The Apache Software Foundation.</div>
+      <br/>
+      <div class="xleft">All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+    </footer>
+  </custom>
+</project>