diff --git a/docs/architecture.rst b/docs/architecture.rst
index a3883d55403..7bf66c4a9c9 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -8,7 +8,7 @@ Diagram
 ::
 
                                       +-----------+
-                                      | Rackspace |
+                                      | Azure     |
                                 +-----| Load Bal  |------+
                                 |     +-----------+      |
                                 |                        |
diff --git a/docs/sponsors.rst b/docs/sponsors.rst
index dfa565a2d8d..2286a4ba1f2 100644
--- a/docs/sponsors.rst
+++ b/docs/sponsors.rst
@@ -9,8 +9,7 @@ supporting us.
 Current sponsors
 ----------------
 
-* `Rackspace`_ - They cover all of our hosting expenses every month.  This is a pretty large sum of money, averaging around $3,000/mo, and we are really grateful to have them as a sponsor.
-* `Mozilla`_ - Mozilla has given us a `MOSS grant`_ for building specific features, and have funded Eric Holscher to work on Read the Docs at $1,000/mo for 2016.
+* `Microsoft Azure`_ - They cover all of our hosting expenses every month.  This is a pretty large sum of money, averaging around $3,000/mo, and we are really grateful to have them as a sponsor.
 * `Cloudflare`_ - Cloudflare is providing us with an enterprise plan of their SSL for SaaS Providers product that enables us to provide SSL certificates for custom domains.
 * You? (Email us at rev@readthedocs.org for more info)
 
@@ -23,6 +22,8 @@ Past sponsors
 * `Django Software Foundation`_
 * `Lab305`_
 * `Twilio`_
+* `Rackspace`_
+* `Mozilla`_
 
 .. _MOSS grant: https://blog.readthedocs.com/rtd-awarded-mozilla-open-source-support-grant/
 .. _Revsys: http://www.revsys.com/
@@ -34,6 +35,7 @@ Past sponsors
 .. _Mozilla: https://www.mozilla.org/en-US/
 .. _Twilio: http://twilio.com/
 .. _Cloudflare: https://www.cloudflare.com/
+.. _Microsoft Azure: https://azure.microsoft.com/
 
 
 Sponsorship Information
diff --git a/readthedocs/templates/homepage.html b/readthedocs/templates/homepage.html
index 4f28cb834ae..12b04d54a0c 100644
--- a/readthedocs/templates/homepage.html
+++ b/readthedocs/templates/homepage.html
@@ -165,7 +165,7 @@ <h2>{% trans "Read the Docs is funded by the community" %}</h2>
 
     <p>
       {% blocktrans trimmed %}
-      Hosting for the project is graciously provided by <a href="http://www.rackspace.com/cloud/">Rackspace</a>.
+      Hosting for the project is graciously provided by <a href="https://azure.microsoft.com/">Microsoft Azure</a>.
       {% endblocktrans %}
     </p>
   </section>