diff --git a/README.txt b/README.txt
index 06cf03c174e49bf9ecf5548e4d34f9206668e442..d87c06fe090f43828a544397cec4d49987cc8695 100644
--- a/README.txt
+++ b/README.txt
@@ -17,7 +17,7 @@ To submit bug reports and feature suggestions, or to track changes:
   http://drupal.org/project/libraries
 
 * PHPMailer library
-  https://github.com/Synchro/PHPMailer
+  https://github.com/PHPMailer/PHPMailer
 
 Optional:
 
@@ -33,23 +33,20 @@ Optional:
 
 -- INSTALLATION --
 
-1. Download PHPMailer from
+1. Download the latest PHPMailer library from
 
-     https://github.com/Synchro/PHPMailer/tags
+     https://github.com/PHPMailer/PHPMailer/tags
 
-   and extract the following files to the phpmailer subdirectory of your
-   libraries directory:
+   and extract the following files into a 'phpmailer' library directory:
 
-     class.phpmailer.php
-     class.smtp.php
-
-   Be careful NOT to extract the path names contained in the archive.
+     sites/all/libraries/phpmailer/class.phpmailer.php
+     sites/all/libraries/phpmailer/class.smtp.php
 
    It is recommended that you create your libraries directory at one of the
    following locations:
 
-     sites/all/libraries
-     sites/<domain>/libraries
+     sites/all/libraries/phpmailer
+     sites/<site>/libraries/phpmailer
 
    Consult the Libraries API documentation for further information.
 
diff --git a/phpmailer.install b/phpmailer.install
index 6bd785a5ebae2d414aa6662183f9f0116f0cc19d..c8962f3ba3074312e0097ac4182f22b990d74e40 100644
--- a/phpmailer.install
+++ b/phpmailer.install
@@ -30,7 +30,7 @@ function phpmailer_requirements($phase) {
         'value' => $t('Missing'),
         'severity' => REQUIREMENT_ERROR,
         'description' => $t('Please download <a href="@url">PHPMailer for PHP5/6</a>, extract the archive and copy the contents to the following location:<br /><code>@path</code>. Make sure the main file, class.phpmailer.php, is located at<br /><code>@class</code>.', array(
-          '@url' => 'https://github.com/Synchro/PHPMailer/tags',
+          '@url' => 'https://github.com/PHPMailer/PHPMailer/tags',
           '@path' => $path,
           '@class' => $path . '/class.phpmailer.php',
         )),