diff --git a/templates/public/donate.html b/templates/public/donate.html
index d8fa8847..b5fc43df 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 {% load cache %}
+{% load cdn %}
 
 {% block title %}Arch Linux - Donate{% endblock %}
 
 {% block content %}
-{% cache 600 donations %}
+{% cache 600 donations secure %}
 <div id="donations" class="box">
 
     <h2>Donate to Arch Linux</h2>
@@ -57,18 +58,18 @@ <h3>Commercial sponsors and contributions</h3>
     in a server rack, bandwidth, and electricity for our main server.</p>
 
     <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
-        title="velocity network"><img src="/media/vnet_button.png" class="sponsor-btn-vnet"
+        title="velocity network"><img src="{% cdnprefix %}/media/vnet_button.png" class="sponsor-btn-vnet"
         title="" alt="velocity network - it's about time" /></a>
 
     <p>We also wish to extend a special Thank You to <a
         href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
         title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a>
     for their generous and ongoing contribution of a dedicated Arch Linux
-    server . You too can have a dedicated Arch Linux server hosted by SevenL...
+    server. You too can have a dedicated Arch Linux server hosted by SevenL...
     head over to their website for more details.</p>
 
     <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
-        title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png"
+        title="SevenL Networks - Dedicated Arch Linux servers"><img src="{% cdnprefix %}/media/sevenl_button.png"
         class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution"
         alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
 
@@ -76,7 +77,7 @@ <h3>Commercial sponsors and contributions</h3>
         title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
 
     <a href="http://www.airvm.com/ArchLinux"
-        title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.png"
+        title="AirVM.com - Your Green Technology Partner"><img src="{% cdnprefix %}/media/airvm_button.png"
         class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
 
     <h3>Past donors</h3>
diff --git a/templates/public/index.html b/templates/public/index.html
index aa3f5c08..ace7bd31 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load markup %}
 {% load cache %}
+{% load cdn %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" />
@@ -8,7 +9,7 @@
 {% endblock %}
 
 {% block content_left %}
-{% cache 300 main-page-left %}
+{% cache 300 main-page-left secure %}
 <div id="intro" class="box">
 
     <h2>A simple, lightweight distribution</h2>
@@ -41,7 +42,7 @@ <h3>Latest News <span class="more">(<a href="{% url news-list %}"
                 title="Browse the news archives">more</a>)</span></h3>
 
     <a href="/feeds/news/" title="Arch News RSS Feed"
-        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
     <h4><a href="{{ news.get_absolute_url }}"
@@ -55,7 +56,7 @@ <h4><a href="{{ news.get_absolute_url }}"
 {% endblock %}
 
 {% block content_right %}
-{% cache 300 main-page-right %}
+{% cache 300 main-page-right secure %}
 <div id="pkgsearch" class="widget">
 
     <form id="pkgsearch-form" method="get" action="/packages/">
@@ -73,7 +74,7 @@ <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
             title="Browse all of the latest packages">more</a>)</span></h3>
 
     <a href="/feeds/packages/" title="Arch Package Updates RSS Feed"
-        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     <table>
         {% for update in pkg_updates %}
@@ -207,9 +208,15 @@ <h4>About</h4>
 
 <div id="arch-sponsors" class="widget">
 
-    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"><img src="/media/vnet_button.png" alt="Velocity Network - It's about time" /></a>
-    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
-    <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
+        <img src="{% cdnprefix %}/media/vnet_button.png" alt="Velocity Network - It's about time" />
+    </a>
+    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">
+        <img src="{% cdnprefix %}/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" />
+    </a>
+    <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
+        <img src="{% cdnprefix %}/media/airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" />
+    </a>
 
 </div>
 {% endcache %}