diff --git a/www/essex/index.html b/www/essex/index.html
index 6789ab554d..dd2d000f62 100644
--- a/www/essex/index.html
+++ b/www/essex/index.html
@@ -10,11 +10,11 @@
   <!-- Google Fonts -->
   <link href="http://fonts.googleapis.com/css?family=PT+Sans&amp;subset=latin" rel="stylesheet" type="text/css"/>
   <!-- Framework CSS -->
-  <link href="http://openstack.org/themes/openstack/css/blueprint/screen.css" media="screen, projection" rel="stylesheet" type="text/css"/>
-  <link href="http://openstack.org/themes/openstack/css/blueprint/print.css" media="print" rel="stylesheet" type="text/css"/>
-  <!--[if lt IE 8]><link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
+  <link href="http://www.openstack.org/themes/openstack/css/blueprint/screen.css" media="screen, projection" rel="stylesheet" type="text/css"/>
+  <link href="http://www.openstack.org/themes/openstack/css/blueprint/print.css" media="print" rel="stylesheet" type="text/css"/>
+  <!--[if lt IE 8]><link rel="stylesheet" href="http://www.openstack.org/themes/openstack/css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
   <!-- OpenStack Specific CSS -->
-  <link href="http://openstack.org/themes/openstack/css/main.css" media="screen, projection, print" rel="stylesheet" type="text/css"/>
+  <link href="http://www.openstack.org/themes/openstack/css/main.css" media="screen, projection, print" rel="stylesheet" type="text/css"/>
   <link href="../common/css/docblitz.css" rel="stylesheet" type="text/css"/>
   <!--<script type="text/javascript">
  
diff --git a/www/static/common/css/combined.css b/www/static/common/css/combined.css
index 93dd9ec8b7..f9cc608046 100755
--- a/www/static/common/css/combined.css
+++ b/www/static/common/css/combined.css
@@ -2436,7 +2436,7 @@ ul.marketplace-nav a:hover {
   color: #DA422F; }
 
 ul.marketplace-nav a span {
-  background: url("http://openstack.org/marketplace/code/ui/frontend/images/marketplace-icons.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+  background: url("http://www.openstack.org/marketplace/code/ui/frontend/images/marketplace-icons.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
   display: block;
   height: 50px;
   margin: auto;
@@ -2494,7 +2494,7 @@ ul.marketplace-nav .current a {
   font-weight: 300; }
 
 .details-button {
-  background: url("http://openstack.org/marketplace/code/ui/frontend/images/register-arrow.png") no-repeat scroll 85% center #000000;
+  background: url("http://www.openstack.org/marketplace/code/ui/frontend/images/register-arrow.png") no-repeat scroll 85% center #000000;
   color: #FFFFFF !important;
   display: inline-block;
   margin-right: -10px;
@@ -2944,7 +2944,7 @@ img.summit-landing-logo {
 
 a.rss {
   color: #E46616;
-  background: url("http://openstack.org/themes/openstack/images/rss.png") no-repeat left center white;
+  background: url("http://www.openstack.org/themes/openstack/images/rss.png") no-repeat left center white;
   padding-left: 20px;
   float: right; }
 
@@ -2956,7 +2956,7 @@ a.rss {
 
 .register a, .register a:visited {
   display: block;
-  background: url("http://openstack.org/themes/openstack/images/pointer-arrow.png") no-repeat 90% center #FF9631;
+  background: url("http://www.openstack.org/themes/openstack/images/pointer-arrow.png") no-repeat 90% center #FF9631;
   color: white;
   padding: 10px 20px;
   border-radius: 4px;
@@ -2972,12 +2972,12 @@ a.rss {
   width: 169px;
   padding: 6px;
   padding-top: 140px;
-  background: url("http://openstack.org/themes/openstack/images/conferences/portland/summit-videos.png") no-repeat top center;
+  background: url("http://www.openstack.org/themes/openstack/images/conferences/portland/summit-videos.png") no-repeat top center;
   color: black;
   text-decoration: none !important; }
 
 .summit-videos#atlanta-experience {
-  background: url("http://openstack.org/themes/openstack/images/conferences/paris/atlanta-experience.png") no-repeat top center; }
+  background: url("http://www.openstack.org/themes/openstack/images/conferences/paris/atlanta-experience.png") no-repeat top center; }
 
 ul.documents {
   list-style: none;
@@ -2987,7 +2987,7 @@ ul.documents li a, ul.documents li a:visited {
   padding: 15px 10px 15px 45px;
   display: block;
   list-style: none;
-  background: url("http://openstack.org/themes/openstack/images/pdf-icon.png") no-repeat 15px center #edf2f7;
+  background: url("http://www.openstack.org/themes/openstack/images/pdf-icon.png") no-repeat 15px center #edf2f7;
   margin: 1px 0px 0px 0px;
   color: #30739C;
   border-radius: 4px; }
diff --git a/www/templates/footer.tmpl b/www/templates/footer.tmpl
index dad440e614..30965b1484 100644
--- a/www/templates/footer.tmpl
+++ b/www/templates/footer.tmpl
@@ -5,28 +5,28 @@
                 <div class="col-lg-2 col-sm-2">
                     <h3>OpenStack</h3>
                     <ul>
-                        <li><a href="http://openstack.org/foundation">About the Foundation</a></li>
+                        <li><a href="http://www.openstack.org/foundation">About the Foundation</a></li>
                         <li><a
-href="http://openstack.org/projects/">Projects</a></li>
+href="http://www.openstack.org/projects/">Projects</a></li>
                         <li><a
-href="http://openstack.org/projects/openstack-security/">OpenStack
+href="http://www.openstack.org/projects/openstack-security/">OpenStack
 Security</a></li>
                         <li><a
-href="http://openstack.org/projects/openstack-faq/">Common Questions</a></li>
-                        <li><a href="http://openstack.org/blog/">Blog</a></li>
+href="http://www.openstack.org/projects/openstack-faq/">Common Questions</a></li>
+                        <li><a href="http://www.openstack.org/blog/">Blog</a></li>
                     </ul>
                 </div>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Community</h3>
                     <ul>
-                        <li><a href="http://openstack.org/community/">User
+                        <li><a href="http://www.openstack.org/community/">User
 Groups</a></li>
                         <li><a
-href="http://openstack.org/community/events/">Events</a></li>
+href="http://www.openstack.org/community/events/">Events</a></li>
                         <li><a
-href="http://openstack.org/community/jobs/">Jobs</a></li>
+href="http://www.openstack.org/community/jobs/">Jobs</a></li>
                         <li><a
-href="http://openstack.org/foundation/companies/">Companies</a></li>
+href="http://www.openstack.org/foundation/companies/">Companies</a></li>
                         <li><a
 href="https://wiki.openstack.org/wiki/How_To_Contribute">Contribute</a></li>
                     </ul>
@@ -37,7 +37,7 @@ href="https://wiki.openstack.org/wiki/How_To_Contribute">Contribute</a></li>
                         <li><a href="http://docs.openstack.org">OpenStack
 Manuals</a></li>
                         <li><a
-href="http://openstack.org/software/start/">Getting Started</a></li>
+href="http://www.openstack.org/software/start/">Getting Started</a></li>
                         <li><a href="http://developer.openstack.org">API
 Documentation</a></li>
                         <li><a href="https://wiki.openstack.org">Wiki</a></li>
@@ -46,12 +46,12 @@ Documentation</a></li>
                 <div class="col-lg-2 col-sm-2">
                     <h3>Branding & Legal</h3>
                     <ul>
-                        <li><a href="http://openstack.org/brand/">Logos &
+                        <li><a href="http://www.openstack.org/brand/">Logos &
 Guidelines</a></li>
                         <li><a
-href="http://openstack.org/brand/openstack-trademark-policy/">Trademark
+href="http://www.openstack.org/brand/openstack-trademark-policy/">Trademark
 Policy</a></li>
-                        <li><a href="http://openstack.org/privacy/">Privacy
+                        <li><a href="http://www.openstack.org/privacy/">Privacy
 Policy</a></li>
                         <li><a
 href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributors_License_Agreement">OpenStack
diff --git a/www/templates/header.tmpl b/www/templates/header.tmpl
index 56e7f8793f..f16dbb9814 100644
--- a/www/templates/header.tmpl
+++ b/www/templates/header.tmpl
@@ -275,7 +275,7 @@ OpenStack Events</a></li>
 
 
                         <li>
-                            <a href="http://openstack.org/Security/login/"
+                            <a href="https://www.openstack.org/Security/login/"
 class="sign-in-btn">Sign In</a>
                         </li>
                     </ul>