diff --git a/Rakefile b/Rakefile
index 76b28d86..37850bed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -105,6 +105,12 @@ task :compile_nginx_mapfiles => [:environment] do
     end
   end
 
+  File.open('./files/maps/subdomain-to-domain.txt', 'w') do |file|
+    Site.select(:username, :domain).exclude(domain: nil).exclude(domain: '').all.each do |site|
+      file.write "#{site.username}.neocities.org #{site.values[:domain]};\n"
+    end
+  end
+
   File.open('./files/maps/sandboxed.txt', 'w') do |file|
     usernames = DB["select username from sites where created_at > ? and parent_site_id is null and (plan_type is null or plan_type='free')", 2.days.ago].all.collect {|s| s[:username]}.each {|username| file.write "#{username} 1;\n"}
   end
diff --git a/views/index.erb b/views/index.erb
index 3515316d..79bb39bb 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -281,7 +281,7 @@
   <div class="row">
     <p>Sponsored by</p>
     <h2>Your Company Name Here</h2>
-    <p>Interested in sponsoring Neocities? <a href="mailto:sponsorships@neocities.org">Let's get in touch.</a></p>
+    <p>Interested in sponsoring Neocities? <a href="https://neocities.org/contact">Let's get in touch.</a></p>
   </div>
 </section>
 </main>
diff --git a/views/press.erb b/views/press.erb
index 0263dec2..7505e74f 100644
--- a/views/press.erb
+++ b/views/press.erb
@@ -71,7 +71,7 @@ Why We All Need to Make the Internet Fun Again</a></h3>
 
       <div class="col col-33">
         <h2 style="margin-bottom: 9px;">Contact Us</h2>
-        <p><a href="mailto:press@neocities.org"><i class="fa fa-envelope-o"></i> press@neocities.org</a></p>
+        <p><a href="https://neocities.org/contact"><i class="fa fa-envelope-o"></i> Contact Form</a></p>
 
         <h2>Brand Assets</h2>
         <div class="brand-asset">