diff --git a/docs/dev_install.rst b/docs/dev_install.rst
index c2992f3d..8a4072b4 100644
--- a/docs/dev_install.rst
+++ b/docs/dev_install.rst
@@ -24,7 +24,6 @@ with. Here's a quick step-by-step on how to do that:
 	DEBUG=True
 	TEMPLATE_DEBUG=DEBUG
 	SUPPRESS_NOTIFICATIONS=True
-	MASTERSITE_ROOT="http://localhost:8000"
 	SITE_ROOT="http://localhost:8000"
 	NO_HTTPS_REDIRECT=True
 #. In the pgweb directory run the following command to create all
diff --git a/pgweb/account/views.py b/pgweb/account/views.py
index cb089b1a..3c1e5b64 100644
--- a/pgweb/account/views.py
+++ b/pgweb/account/views.py
@@ -125,7 +125,7 @@ def signup(request):
 							   form.cleaned_data['email'],
 							   'Your new postgresql.org community account',
 							   'account/new_account_email.txt',
-							   { 'uid': int_to_base36(user.id), 'token': token, 'user': user, 'mastersite': settings.MASTERSITE_ROOT}
+							   { 'uid': int_to_base36(user.id), 'token': token, 'user': user}
 							   )
 
 			return HttpResponseRedirect('/account/signup/complete/')
diff --git a/pgweb/settings.py b/pgweb/settings.py
index 5b7ca67f..c6e6ec04 100644
--- a/pgweb/settings.py
+++ b/pgweb/settings.py
@@ -115,7 +115,6 @@ INSTALLED_APPS = [
 # In particular, adjust the email addresses
 ###
 SITE_ROOT="http://www.postgresql.org"                  # Root of working URLs
-MASTERSITE_ROOT="http://wwwmaster.postgresql.org"      # Root of working master web
 FTP_PICKLE="/usr/local/pgweb/ftpsite.pickle"           # Location of file with current contents from ftp site
 NOTIFICATION_EMAIL="someone@example.com"               # Address to send notifications *to*
 NOTIFICATION_FROM="someone@example.com"                # Address to send notifications *from*
diff --git a/templates/account/new_account_email.txt b/templates/account/new_account_email.txt
index 2ca21165..876f530c 100644
--- a/templates/account/new_account_email.txt
+++ b/templates/account/new_account_email.txt
@@ -3,6 +3,6 @@ PostgreSQL community account.
 
 Please go to the following page and choose a new password:
 
-{{mastersite}}/account/reset/{{uid}}-{{token}}/
+https://www.postgresql.org/account/reset/{{uid}}-{{token}}/
 
 Your username, in case you've forgotten, is {{user.username}}.
diff --git a/templates/core/moderation_report.txt b/templates/core/moderation_report.txt
index 6f6de91a..5f1d8854 100644
--- a/templates/core/moderation_report.txt
+++ b/templates/core/moderation_report.txt
@@ -5,4 +5,4 @@ The following items are currently pending moderation:
 
 Moderators; please check and moderate these items as soon as possible!
 
-{{mastersite}}/admin/pending/
+https://www.postgresql.org/admin/admin/pending/
diff --git a/tools/moderation/moderation_report.py b/tools/moderation/moderation_report.py
index f7adf7db..2fbcd59d 100755
--- a/tools/moderation/moderation_report.py
+++ b/tools/moderation/moderation_report.py
@@ -21,5 +21,4 @@ if len(counts):
 					   "core/moderation_report.txt",
 					   {
 			'items': counts,
-			'mastersite': settings.MASTERSITE_ROOT,
 			})