diff --git a/src/site/apt/examples.apt b/src/site/apt/examples.apt
index d658362b5..bd3a0c2ad 100644
--- a/src/site/apt/examples.apt
+++ b/src/site/apt/examples.apt
@@ -6,54 +6,54 @@
 
 HttpClient Examples
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java}Direct request}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java}Direct request}}
     
     This example demonstrates how to send an HTTP request directly.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java}Request via a proxy}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java}Request via a proxy}}
     
     This example demonstrates how to send an HTTP request via a proxy.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java}Connection management}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java}Connection management}}
     
     This example demonstrates the recommended way of using API to make sure the underlying 
     connection gets released back to the connection manager.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientAbortMethod.java}Abort method}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientAbortMethod.java}Abort method}}
     
     This example demonstrates how to abort an HTTP request before its normal completion.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientAuthentication.java}Client authentication}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientAuthentication.java}Client authentication}}
     
     This example uses HttpClient to execute an HTTP request against a target site that requires user
     authentication.  
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java}Proxy authentication}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java}Proxy authentication}}
     
     A simple example showing execution of an HTTP request over a secure connection tunneled through 
     an authenticating proxy.  
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java}Chunk encoded POST}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java}Chunk encoded POST}}
     
     This example shows how to stream out a request entity using chunk encoding.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java}Custom execution context}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomContext.java}Custom execution context}}
     
     This example demonstrates the use of a local HTTP context populated custom attributes.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientFormLogin.java}Form based logon}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientFormLogin.java}Form based logon}}
     
     This example demonstrates how HttpClient can be used to perform form-based logon.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java}Threaded request execution}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java}Threaded request execution}}
     
     An example that executes HTTP requests from multiple worker threads.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java}Custom SSL context}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientCustomSSL.java}Custom SSL context}}
     
     This example demonstrates how to create secure connections with a custom SSL context.
 
-    * {{{http://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java}Custom protocol interceptors}}
+    * {{{http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/module-client/src/examples/org/apache/http/examples/client/ClientGZipContentCompression.java}Custom protocol interceptors}}
 
     This example shows the use of protocol interceptors to transparently modify properties of HTTP 
     messages sent / received by the HTTP client.
diff --git a/src/site/site.xml b/src/site/site.xml
index a101707cf..093df026d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -31,22 +31,21 @@
 
 <project name="HttpComponents Client">
   <bannerLeft>
-    <name>Jakarta</name>
-    <src>http://jakarta.apache.org/images/logos/jakarta-logo.png</src>
-    <href>http://jakarta.apache.org/</href>
+    <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://jakarta.apache.org/httpcomponents/images/logos/httpcomponents.png</src>
-    <href>http://jakarta.apache.org/httpcomponents/</href>
+    <src>../images/logos/httpcomponents.png</src>
+    <href>http://hc.apache.org/</href>
   </bannerRight>
 
   <body>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
-      <item name="Jakarta" href="http://jakarta.apache.org/"/>
-      <item name="HttpComponents" href=".."/>
+      <item name="HttpComponents" href="http://hc.apache.org/"/>
     </links>
 
     <menu name="HttpComponents">