diff --git a/include/do-download.inc b/include/do-download.inc
index 66def07ba..095a70dea 100644
--- a/include/do-download.inc
+++ b/include/do-download.inc
@@ -89,7 +89,7 @@ function download_log($mirror, $file)
     $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '-');
     
     // String to pass on as a query to the remote log
-    $log_file = "http://master2.php.net/log_download.php" .
+    $log_file = "https://master.php.net/log_download.php" .
                 "?download_file=" . urlencode($file) .
                 "&mirror=" .        urlencode($mirror) .
                 "&user_referer=" .  urlencode($referer) .
diff --git a/include/shared-manual.inc b/include/shared-manual.inc
index 6877a9c67..b521e94c0 100644
--- a/include/shared-manual.inc
+++ b/include/shared-manual.inc
@@ -466,21 +466,21 @@ function manual_note_display($date, $name, $text, $id)
         $admin = "\n  <span class=\"admin\">\n   " .
 
         make_popup_link(
-            'https://master2.php.net/manage/user-notes.php?action=edit+' . $id,
+            'https://master.php.net/manage/user-notes.php?action=edit+' . $id,
             make_image('notes-edit.gif', 'edit note'),
             'admin',
             'scrollbars=yes,width=650,height=400'
         ) . "\n   " .
 
         make_popup_link(
-            'https://master2.php.net/manage/user-notes.php?action=reject+' . $id,
+            'https://master.php.net/manage/user-notes.php?action=reject+' . $id,
             make_image('notes-reject.gif', 'reject note'),
             'admin',
             'scrollbars=no,width=300,height=200'
         ) . "\n   " .
 
         make_popup_link(
-            'https://master2.php.net/manage/user-notes.php?action=delete+' . $id,
+            'https://master.php.net/manage/user-notes.php?action=delete+' . $id,
             make_image('notes-delete.gif', 'delete note'),
             'admin',
             'scrollbars=no,width=300,height=200'
diff --git a/mailing-lists.php b/mailing-lists.php
index c5cce93e2..bbdbafd2f 100644
--- a/mailing-lists.php
+++ b/mailing-lists.php
@@ -68,7 +68,7 @@ if (isset($_POST['maillist'])) {
 
         // Get in contact with master server to [un]subscribe the user
         $result = posttohost(
-            "http://master2.php.net/entry/subscribe.php",
+            "https://master.php.net/entry/subscribe.php",
             array(
                 "request"  => $request,
                 "email"    => $_POST['email'],
diff --git a/manual/add-note.php b/manual/add-note.php
index 81fdec964..8f672b76e 100644
--- a/manual/add-note.php
+++ b/manual/add-note.php
@@ -97,7 +97,7 @@ if ($process) {
         // Post the variables to the central user note script
         // ($MQ is defined in prepend.inc)
         $result = posttohost(
-            "http://master2.php.net/entry/user-note.php",
+            "https://master.php.net/entry/user-note.php",
             array(
                 'user'    => ($MQ ? stripslashes($user) : $user),
                 'note'    => ($MQ ? stripslashes($note) : $note),
diff --git a/submit-event.php b/submit-event.php
index e56231a0c..733985004 100644
--- a/submit-event.php
+++ b/submit-event.php
@@ -121,7 +121,7 @@ if ($process) {
 
     if (isset($_POST['action']) && $_POST['action'] === 'Submit' && empty($errors)) {
         // Submit to master.php.net
-        $result = posttohost("http://master2.php.net/entry/event.php", $_POST);
+        $result = posttohost("https://master.php.net/entry/event.php", $_POST);
         if ($result) {
             $errors[] = "There was an error processing your submission: $result";
         }