diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
index 784465b2b..4b3886c9d 100644
--- a/cpp/test/phonenumbers/asyoutypeformatter_test.cc
+++ b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
@@ -94,7 +94,7 @@ TEST_F(AsYouTypeFormatterTest, InvalidPlusSign) {
 }
 
 TEST_F(AsYouTypeFormatterTest, TooLongNumberMatchingMultipleLeadingDigits) {
-  // See http://code.google.com/p/libphonenumber/issues/detail?id=36
+  // See https://github.com/googlei18n/libphonenumber/issues/36
   // The bug occurred last time for countries which have two formatting rules
   // with exactly the same leading digits pattern but differ in length.
   formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::GetUnknown()));
@@ -1226,7 +1226,7 @@ TEST_F(AsYouTypeFormatterTest,
   // leading digit patterns; when we try again to extract a country code we
   // should ensure we use the last leading digit pattern, rather than the first
   // one such that it *thinks* it's found a valid formatting rule again.
-  // https://code.google.com/p/libphonenumber/issues/detail?id=437
+  // https://github.com/googlei18n/libphonenumber/issues/437
   EXPECT_EQ("+8698812", formatter_->InputDigit('2', &result_));
   EXPECT_EQ("+86988123", formatter_->InputDigit('3', &result_));
   EXPECT_EQ("+869881234", formatter_->InputDigit('4', &result_));
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 3461a8262..75977a0db 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -66,7 +66,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase {
   }
 
   public void testTooLongNumberMatchingMultipleLeadingDigits() {
-    // See http://code.google.com/p/libphonenumber/issues/detail?id=36
+    // See https://github.com/googlei18n/libphonenumber/issues/36
     // The bug occurred last time for countries which have two formatting rules with exactly the
     // same leading digits pattern but differ in length.
     AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ);
@@ -1164,7 +1164,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase {
     // when we try again to extract a country code we should ensure we use the last leading digit
     // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule
     // again.
-    // https://code.google.com/p/libphonenumber/issues/detail?id=437
+    // https://github.com/googlei18n/libphonenumber/issues/437
     assertEquals("+8698812", formatter.inputDigit('2'));
     assertEquals("+86988123", formatter.inputDigit('3'));
     assertEquals("+869881234", formatter.inputDigit('4'));
diff --git a/java/release_notes.txt b/java/release_notes.txt
index 1db5019d7..7f85eba5e 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -430,7 +430,7 @@ Oct 10, 2012: libphonenumber-5.2
  - Adds isNumberGeographical() method.
  - Adds getRegionCodesForCountryCode() method.
  - Fixing issue with getSupportedGlobalNetworkCallingCodes()
-   [http://code.google.com/p/libphonenumber/issues/detail?id=202]
+   [https://github.com/googlei18n/libphonenumber/issues/202]
  - Ensures that returned collections are unmodifiable where necessary
    [there is a very slight risk that this may break existing users who were relying on being able
    to modify these collections, but doing so would be breaking lots of other assumptions that this
diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
index 0db5a9ec9..c196b117b 100644
--- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
+++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
@@ -73,7 +73,7 @@ function testInvalidPlusSign() {
 }
 
 function testTooLongNumberMatchingMultipleLeadingDigits() {
-  // See http://code.google.com/p/libphonenumber/issues/detail?id=36
+  // See https://github.com/googlei18n/libphonenumber/issues/36
   // The bug occurred last time for countries which have two formatting rules
   // with exactly the same leading digits pattern but differ in length.
   /** @type {i18n.phonenumbers.AsYouTypeFormatter} */
@@ -1197,7 +1197,7 @@ function testAYTFNumberPatternsBecomingInvalidShouldNotResultInDigitLoss() {
   // leading digit patterns; when we try again to extract a country code we
   // should ensure we use the last leading digit pattern, rather than the first
   // one such that it *thinks* it's found a valid formatting rule again.
-  // https://code.google.com/p/libphonenumber/issues/detail?id=437
+  // https://github.com/googlei18n/libphonenumber/issues/437
   assertEquals('+8698812', f.inputDigit('2'));
   assertEquals('+86988123', f.inputDigit('3'));
   assertEquals('+869881234', f.inputDigit('4'));
diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 40f569f13..cbbc9c61c 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -10599,7 +10599,7 @@
              numbers. It seems almost impossible to know for some of these numbers whether they are
              land-line or mobile, since the ranges overlap. Extra prefixes added: 7601, 768[567],
              7695, 8299, 8309. New prefixes were also added based on the document provided from
-             mobile carriers: https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
+             mobile carriers: https://github.com/googlei18n/libphonenumber/issues/260 -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -15891,7 +15891,7 @@
         </nationalNumberPattern>
         <exampleNumber>35123456</exampleNumber>
       </fixedLine>
-      <!-- Added "49\d" in response to https://code.google.com/p/libphonenumber/issues/detail?id=529
+      <!-- Added "49\d" in response to https://github.com/googlei18n/libphonenumber/issues/529
            which might be overly permissive, but we don't have an official documentation for this
            and only a small number of numbers were found online. At least 492 and 495 are valid.
            -->
diff --git a/resources/carrier/en/27.txt b/resources/carrier/en/27.txt
index 5ce161a33..abeab6192 100644
--- a/resources/carrier/en/27.txt
+++ b/resources/carrier/en/27.txt
@@ -15,7 +15,7 @@
 # The carrier prefixes were added according to the Wikipedia page
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Africa
 # and the open-source bug
-# https://code.google.com/p/libphonenumber/issues/detail?id=489
+# https://github.com/googlei18n/libphonenumber/issues/489
 
 27603|MTN
 27604|MTN
diff --git a/resources/carrier/en/679.txt b/resources/carrier/en/679.txt
index f057d3485..2e6b709d8 100644
--- a/resources/carrier/en/679.txt
+++ b/resources/carrier/en/679.txt
@@ -14,8 +14,8 @@
 
 # Digicel prefix from ITU doc. Vodafone prefixes from Wikipedia and open-source
 # bug reports, e.g.
-# https://code.google.com/p/libphonenumber/issues/detail?id=476
-# https://code.google.com/p/libphonenumber/issues/detail?id=386
+# https://github.com/googlei18n/libphonenumber/issues/476
+# https://github.com/googlei18n/libphonenumber/issues/386
 
 6797|Digicel
 67984|Vodafone