diff --git a/templates/account/password_reset_email.txt b/templates/account/password_reset_email.txt
index 274a25dd..e5ee92f9 100644
--- a/templates/account/password_reset_email.txt
+++ b/templates/account/password_reset_email.txt
@@ -3,7 +3,7 @@ PostgreSQL community account.
 
 Please go to the following page and choose a new password:
 
-https://wwwmaster.postgresql.org/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/tools/ftp/spider_ftp.py b/tools/ftp/spider_ftp.py
index 2f552d58..b6a42449 100755
--- a/tools/ftp/spider_ftp.py
+++ b/tools/ftp/spider_ftp.py
@@ -3,7 +3,7 @@
 #
 # spider_ftp.py - spider the ftp site and generate an output file with all
 #                 the metadata we require, that can be transferred over to
-#                 the wwwmaster server.
+#                 the master web server.
 #
 
 import sys