diff --git a/mailing-lists.php b/mailing-lists.php
index 9ecb0522cc..9f50235fe0 100644
--- a/mailing-lists.php
+++ b/mailing-lists.php
@@ -21,7 +21,7 @@
  lists</a>, the <a href="http://pecl.php.net/support.php">PECL
  lists</a>, and the <a href="http://gtk.php.net/resources.php">PHP-GTK
  lists</a> on their own pages.
-</p> 
+</p>
 
 <a id="local"></a>
 <h3>Local Mailing Lists and Newsgroups</h3>
diff --git a/unsub.php b/unsub.php
index 69704663c5..4b8c83cb4f 100644
--- a/unsub.php
+++ b/unsub.php
@@ -9,7 +9,7 @@
  lists</a>, the <a href="http://pecl.php.net/support.php">PECL
  lists</a>, and the <a href="http://gtk.php.net/resources.php">PHP-GTK
  lists</a> on their own pages.
-</p> 
+</p>
 ';
 site_header("Unsubscribing", ["current" => "community"]);
 ?>
@@ -40,15 +40,15 @@
 
 <p>
  To unsubscribe from one of those mailing lists, all you usually need to
- do is send an email to <code><em>listname</em>-unsubscribe@lists.php.net</code>
+ do is send an email to <code><em>listname</em>+unsubscribe@lists.php.net</code>
  (substituting the name of the list for <code><em>listname</em></code>
- &mdash; for example, <code>php-general-unsubscribe@lists.php.net</code>).
+ &mdash; for example, <code>php-general+unsubscribe@lists.php.net</code>).
 </p>
 
 <p>
  If you are subscribed to the <strong>digest version</strong> of the
  mailing list, you need to send an email to
- <code><em>listname</em>-digest-unsubscribe@lists.php.net</code>.
+ <code><em>listname</em>+unsubscribe-digest@lists.php.net</code>.
 </p>
 
 <p>