diff --git a/README.md b/README.md
index 722ee42..b1fb9d8 100644
--- a/README.md
+++ b/README.md
@@ -95,15 +95,13 @@ Dhall configuration language:
 
 Complete:
 
-* [`dhall`](https://github.com/Gabriel439/Haskell-Dhall-Library) -
+* [`dhall-haskell`](https://github.com/dhall-lang/dhall-haskell) -
   Haskell integration (this package)
-* [`dhall-nix`](https://github.com/Gabriel439/Haskell-Dhall-Nix-Library) -
-  Nix integration
-* [`dhall-json`](https://github.com/Gabriel439/Haskell-Dhall-JSON-Library) -
+* [`dhall-nix`](https://github.com/dhall-lang/dhall-nix) - Nix integration
+* [`dhall-json`](https://github.com/dhall-lang/dhall-json) -
   JSON and YAML integration
-* [`dhall-bash`](https://github.com/Gabriel439/Haskell-Dhall-Bash-Library) -
-  Bash integration
-* [`dhall-text`](https://github.com/Gabriel439/Haskell-Dhall-Text-Library) - Template engine
+* [`dhall-bash`](https://github.com/dhall-lang/dhall-bash) - Bash integration
+* [`dhall-text`](https://github.com/dhall-lang/dhall-text) - Template engine
 
 In progress:
 
diff --git a/dhall.cabal b/dhall.cabal
index f452a55..906ad56 100644
--- a/dhall.cabal
+++ b/dhall.cabal
@@ -8,7 +8,7 @@ License-File: LICENSE
 Copyright: 2017 Gabriel Gonzalez
 Author: Gabriel Gonzalez
 Maintainer: Gabriel439@gmail.com
-Bug-Reports: https://github.com/Gabriel439/Haskell-Dhall-Library/issues
+Bug-Reports: https://github.com/dhall-lang/dhall-haskell/issues
 Synopsis: A configuration language guaranteed to terminate
 Description:
     Dhall is an explicitly typed configuration language that is not Turing
@@ -86,7 +86,7 @@ Extra-Source-Files:
 
 Source-Repository head
     Type: git
-    Location: https://github.com/Gabriel439/Haskell-Dhall-Library
+    Location: https://github.com/dhall-lang/dhall-haskell
 
 Library
     Hs-Source-Dirs: src
diff --git a/src/Dhall/Core.hs b/src/Dhall/Core.hs
index 9ef38a7..01bae70 100644
--- a/src/Dhall/Core.hs
+++ b/src/Dhall/Core.hs
@@ -2385,7 +2385,7 @@ internalError text = error (unlines
     , "You didn't do anything wrong, but if you would like to see this problem fixed   "
     , "then you should report the bug at:                                              "
     , "                                                                                "
-    , "https://github.com/Gabriel439/Haskell-Dhall-Library/issues                      "
+    , "https://github.com/dhall-lang/dhall-haskell/issues                              "
     , "                                                                                "
     , "Please include the following text in your bug report:                           "
     , "                                                                                "
diff --git a/src/Dhall/Import.hs b/src/Dhall/Import.hs
index 2dcb757..21f05bf 100644
--- a/src/Dhall/Import.hs
+++ b/src/Dhall/Import.hs
@@ -514,7 +514,7 @@ instance Show InternalError where
         , "You didn't do anything wrong, but if you would like to see this problem fixed   "
         , "then you should report the bug at:                                              "
         , "                                                                                "
-        , "https://github.com/Gabriel439/Haskell-Dhall-Library/issues                      "
+        , "https://github.com/dhall-lang/dhall-haskell/issues                              "
         , "                                                                                "
         , "Please include the following text in your bug report:                           "
         , "                                                                                "
diff --git a/src/Dhall/Tutorial.hs b/src/Dhall/Tutorial.hs
index 8272ad8..87bccba 100644
--- a/src/Dhall/Tutorial.hs
+++ b/src/Dhall/Tutorial.hs
@@ -2656,7 +2656,7 @@ import Dhall
 -- author, import, and program configuration files.  If you run into any issues
 -- you can report them at:
 --
--- <https://github.com/Gabriel439/Haskell-Dhall-Library/issues>
+-- <https://github.com/dhall-lang/dhall-haskell/issues>
 --
 -- You can also request features, support, or documentation improvements on the
 -- above issue tracker.
diff --git a/src/Dhall/TypeCheck.hs b/src/Dhall/TypeCheck.hs
index cc79326..970c03d 100644
--- a/src/Dhall/TypeCheck.hs
+++ b/src/Dhall/TypeCheck.hs
@@ -738,7 +738,7 @@ _NOT = "\ESC[1mnot\ESC[0m"
 prettyTypeMessage :: TypeMessage s -> ErrorMessages
 prettyTypeMessage (UnboundVariable _) = ErrorMessages {..}
   -- We do not need to print variable name here. For the discussion see:
-  -- https://github.com/Gabriel439/Haskell-Dhall-Library/pull/116
+  -- https://github.com/dhall-lang/dhall-haskell/pull/116
   where
     short = "Unbound variable"