diff --git a/README.md b/README.md
index b262442c..94690a51 100644
--- a/README.md
+++ b/README.md
@@ -101,11 +101,11 @@ If this isn't passing, is there something you can do to help?
 
 ## Contributing
 
-Please submit bug reports, suggestions and pull requests to the [Google Code tracker](https://code.google.com/a/apache-extras.org/p/phpmailer/issues/list) or the [GitHub issue tracker](https://github.com/Synchro/PHPMailer/issues).
+Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/Synchro/PHPMailer/issues).
 
 We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
 
-Please *don't* use the sourceforge project any more.
+Please *don't* use the SourceForge project any more.
 
 ## Changelog
 
@@ -114,12 +114,12 @@ See changelog.md
 ## History
 - PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
 - Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004.
-- The project became an [Apache incubator project on Google Code](https://code.google.com/a/apache-extras.org/p/phpmailer/) in 2010, managed by Jim Jagielski
-- Marcus maintains this [GitHub repository](https://github.com/Synchro/PHPMailer) that's kept in sync with the Google Code project as far as is practical.
+- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski
+- Marcus started this fork on [GitHub repository](https://github.com/Synchro/PHPMailer)
 - Jim and Marcus decide to join efforts and use Github and this project as the canonical and official repo.
 
-### GitHub
-- Official successor to the Sourceforge project
+### What's changed since moving from SourceForge?
+- Official successor to the SourceForge and Googel Code projects
 - Test suite
 - Continuous integration with Travis-CI
 - Composer support
diff --git a/class.phpmailer.php b/class.phpmailer.php
index 0d29a0da..87acdc04 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -3,10 +3,10 @@
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
 |   Version: 5.2.4                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
+|      Site: https://github.com/Synchro/PHPMailer/                          |
 | ------------------------------------------------------------------------- |
-|    Admins: Marcus Bointon                        |
-|    Admins: Jim Jagielski                        |
+|    Admins: Marcus Bointon                                                 |
+|    Admins: Jim Jagielski                                                  |
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) phpmailer@synchromedia.co.uk          |
 |          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
@@ -1428,7 +1428,7 @@ class PHPMailer {
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     if ($this->XMailer == '') {
-        $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (http://code.google.com/a/apache-extras.org/p/phpmailer/)');
+        $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (https://github.com/Synchro/PHPMailer/)');
     } else {
       $myXmailer = trim($this->XMailer);
       if ($myXmailer) {
diff --git a/class.pop3.php b/class.pop3.php
index 2e7cab61..e9f7d851 100644
--- a/class.pop3.php
+++ b/class.pop3.php
@@ -3,10 +3,10 @@
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
 |   Version: 5.2.4                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
+|      Site: https://github.com/Synchro/PHPMailer/                          |
 | ------------------------------------------------------------------------- |
-|    Admins: Marcus Bointon                        |
-|    Admins: Jim Jagielski                        |
+|    Admins: Marcus Bointon                                                 |
+|    Admins: Jim Jagielski                                                  |
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
 |          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
diff --git a/class.smtp.php b/class.smtp.php
index d9b33b43..60363670 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -3,12 +3,12 @@
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
 |   Version: 5.2.4                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
+|      Site: https://github.com/Synchro/PHPMailer/                          |
 | ------------------------------------------------------------------------- |
-|    Admins: Marcus Bointon                        |
-|    Admins: Jim Jagielski                        |
+|    Admins: Marcus Bointon                                                 |
+|    Admins: Jim Jagielski                                                  |
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) phpmailer@synchromedia.co.uk         |
+|          : Marcus Bointon (coolbru) phpmailer@synchromedia.co.uk          |
 |          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
 |   Founder: Brent R. Matzelle (original founder)                           |
 | Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php
index f4c86d2e..3723799f 100644
--- a/test/phpmailerTest.php
+++ b/test/phpmailerTest.php
@@ -720,7 +720,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase
     <body>
         <h1>PHPMailer does HTML!</h1>
         <p>This is a <strong>test message</strong> written in HTML.<br>
-        Go to <a href="http://code.google.com/a/apache-extras.org/p/phpmailer/">http://code.google.com/a/apache-extras.org/p/phpmailer/</a>
+        Go to <a href="https://github.com/Synchro/PHPMailer/">https://github.com/Synchro/PHPMailer/</a>
         for new versions of PHPMailer.</p>
         <p>Thank you!</p>
     </body>
@@ -739,7 +739,7 @@ EOT;
     <body>
         <h1>PHPMailer does HTML!</h1>
         <p>This is a <strong>test message</strong> written in HTML.<br>
-        Go to <a href="http://code.google.com/a/apache-extras.org/p/phpmailer/">http://code.google.com/a/apache-extras.org/p/phpmailer/</a>
+        Go to <a href="https://github.com/Synchro/PHPMailer/">https://github.com/Synchro/PHPMailer/</a>
         for new versions of PHPMailer.</p>
         <p>Thank you!</p>
     </body>
@@ -749,7 +749,7 @@ EOT;
         $plainmessage = <<<'EOT'
 PHPMailer does HTML!
         This is a test message written in HTML.
-        Go to http://code.google.com/a/apache-extras.org/p/phpmailer/
+        Go to https://github.com/Synchro/PHPMailer/
         for new versions of PHPMailer.
         Thank you!
 EOT;