diff --git a/media/donate.gif b/media/donate.gif
deleted file mode 100644
index d637428b..00000000
Binary files a/media/donate.gif and /dev/null differ
diff --git a/templates/public/donate.html b/templates/public/donate.html
index b5fc43df..0dcfcf2a 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -23,33 +23,16 @@ <h2>Donate to Arch Linux</h2>
 
     <h3>Monetary donations</h3>
 
-{% comment %}
-    <p>Financial contributions are accepted via <a title="Click to donate now"
-        href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=aaronmgriffin@gmail.com&amp;currency_code=USD">PayPal</a>.
-    Funds are used for server hardware upgrades, conventions, schwag giveaways and more.</p>
+    <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&amp;Pledge to Arch Linux"/>Click&amp;Pledge</a>.
+    Arch Linux is a member project of the
+    <a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a>
+    non-profit corporation. Funds are used for hosting costs, server hardware
+    upgrades, and more. You are encouraged to learn more about the SPI, as well
+    as <a href="http://www.spi-inc.org/donations/">how donations work</a>.</p>
 
-    <div id="paypal-button">
-        <!-- paypal code -->
-        <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-            <p><input type="hidden" name="cmd" value="_xclick"/></p>
-            <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
-            <p><input type="hidden" name="currency_code" value="USD"/></p>
-            <p><input type="hidden" name="tax" value="0"/></p>
-            <p><input type="hidden" name="lc" value="US"/></p>
-            <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
-            <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
-            <p><input type="hidden" name="no_shipping" value="1"/></p>
-            <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
-            <p><input type="hidden" name="no_note" value="1"/></p>
-            <p><input type="image" src="/media/donate.gif" name="submit"
-            title="Make a PayPal donation to the Arch Linux project"
-            alt="Make a PayPal donation to the Arch Linux project"
-            style="background:transparent;border:none;" /></p>
-        </form>
-    </div>
-{% endcomment %}
-    <p>At the moment, we are currently not taking monetary donations, but we
-    may accept them again in the future.</p>
+    <a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
+        <img src="http://images.clickandpledge.com/flair/buttons/210x34/CP_EN_BK_S_001.gif" alt="Online donation system by ClickandPledge" title="Online donation system by ClickandPledge"/>
+    </a>
 
     <h3>Commercial sponsors and contributions</h3>
 
diff --git a/templates/public/index.html b/templates/public/index.html
index b63876ac..06a6a0c3 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -206,28 +206,11 @@ <h4>About</h4>
 
 </div><!-- #nav-sidebar -->
 
-{% comment %}
-<div id="home-paypal-button" class="widget">
-
-    <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-        <p><input type="hidden" name="cmd" value="_xclick"/></p>
-        <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
-        <p><input type="hidden" name="currency_code" value="USD"/></p>
-        <p><input type="hidden" name="tax" value="0"/></p>
-        <p><input type="hidden" name="lc" value="US"/></p>
-        <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
-        <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
-        <p><input type="hidden" name="no_shipping" value="1"/></p>
-        <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
-        <p><input type="hidden" name="no_note" value="1"/></p>
-        <p><input type="image" src="/media/donate.gif" name="submit"
-        title="Make a PayPal donation to the Arch Linux project"
-        alt="Make a PayPal donation to the Arch Linux project"
-        style="background:transparent;border:none;" /></p>
-    </form>
-
+<div id="home-donate-button" class="widget">
+    <a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
+        <img src="http://images.clickandpledge.com/flair/buttons/210x34/CP_EN_BK_S_001.gif" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
+    </a>
 </div>
-{% endcomment %}
 
 <div id="arch-sponsors" class="widget">