diff --git a/README.rst b/README.rst
index 9b474785c8cff8e0a9eabb7e2a20bda4710c1fdb..df2a3c6b15e9aa7f657ceebbec2be8febcdfef54 100644
--- a/README.rst
+++ b/README.rst
@@ -5,3 +5,9 @@ We are in the process of `renaming GHC modules <https://gitlab.haskell.org/ghc/g
 
 This package aims to make the transition easier by mapping old module names to
 newer module names.
+
+Build with:
+
+.. code::
+
+   cabal new-build --with-compiler /path/to/ghc/HEAD/_build/stage1/bin/ghc
diff --git a/ghc-api-compat.cabal b/ghc-api-compat.cabal
index 4f2ff02b3059da985195cc1de3e75aea4e0734b4..fda2149993ea6a3a950b18dce02302b17c80f728 100644
--- a/ghc-api-compat.cabal
+++ b/ghc-api-compat.cabal
@@ -123,23 +123,23 @@ library
       , GHC.HsToCore.PmCheck.Ppr       as PmPpr
       , GHC.HsToCore.PmCheck.Types     as PmTypes
 
---       , GHC.HsToCore                   as Desugar
---       , GHC.HsToCore.Coverage          as Coverage
---       , GHC.HsToCore.Arrows            as DsArrows
---       , GHC.HsToCore.Binds             as DsBinds
---       , GHC.HsToCore.ForeignCall       as DsCCall
---       , GHC.HsToCore.Expr              as DsExpr
---       , GHC.HsToCore.ForeignCallDecl   as DsForeign
---       , GHC.HsToCore.GuardedRHSs       as DsGRHSs
---       , GHC.HsToCore.ListComp          as DsListComp
---       , GHC.HsToCore.Splice            as DsMeta
---       , GHC.HsToCore.Monad             as DsMonad
---       , GHC.HsToCore.Usage             as DsUsage
---       , GHC.HsToCore.Utils             as DsUtils
---       , GHC.HsToCore.Docs              as ExtractDocs
---       , GHC.HsToCore.Match             as Match
---       , GHC.HsToCore.Match.Constructor as MatchCon
---       , GHC.HsToCore.Match.Literal     as MatchLit
+      , GHC.HsToCore                   as Desugar
+      , GHC.HsToCore.Coverage          as Coverage
+      , GHC.HsToCore.Arrows            as DsArrows
+      , GHC.HsToCore.Binds             as DsBinds
+      , GHC.HsToCore.Foreign.Call      as DsCCall
+      , GHC.HsToCore.Foreign.Decl      as DsForeign
+      , GHC.HsToCore.Expr              as DsExpr
+      , GHC.HsToCore.GuardedRHSs       as DsGRHSs
+      , GHC.HsToCore.ListComp          as DsListComp
+      , GHC.HsToCore.Quote             as DsMeta
+      , GHC.HsToCore.Monad             as DsMonad
+      , GHC.HsToCore.Usage             as DsUsage
+      , GHC.HsToCore.Utils             as DsUtils
+      , GHC.HsToCore.Docs              as ExtractDocs
+      , GHC.HsToCore.Match             as Match
+      , GHC.HsToCore.Match.Constructor as MatchCon
+      , GHC.HsToCore.Match.Literal     as MatchLit
 
       , GHC.Stg.Pipeline               as SimplStg
       , GHC.Stg.CSE                    as StgCse
@@ -194,3 +194,16 @@ library
       , GHC.ByteCode.Types             as ByteCodeTypes
 
       , GHC.CoreToByteCode             as ByteCodeGen
+
+      , GHC.Llvm.MetaData              as Llvm.MetaData
+      , GHC.Llvm.Ppr                   as Llvm.PpLlvm
+      , GHC.Llvm.Types                 as Llvm.Types
+      , GHC.Llvm.Syntax                as Llvm.AbsSyn
+      , GHC.Llvm                       as Llvm
+      , GHC.CmmToLlvm                  as LlvmCodeGen
+      , GHC.CmmToLlvm.Mangler          as LlvmMangler
+      , GHC.CmmToLlvm.Base             as LlvmCodeGen.Base
+      , GHC.CmmToLlvm.CodeGen          as LlvmCodeGen.CodeGen
+      , GHC.CmmToLlvm.Data             as LlvmCodeGen.Data
+      , GHC.CmmToLlvm.Ppr              as LlvmCodeGen.Ppr
+      , GHC.CmmToLlvm.Regs             as LlvmCodeGen.Regs