diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -963,7 +963,7 @@
   ghci_cmds <- ghci_commands `fmap` getGHCiState
   let{ (str, cmds) = case str' of
       ':' : rest -> (rest, ghci_cmds) -- "::" selects a builtin command
-      _ -> (str', ghci_cmds ++ macros) } -- otherwise prefer macros
+      _ -> (str', macros ++ ghci_cmds) } -- otherwise prefer macros
   -- look for exact match first, then the first prefix match
   return $ case [ c | c <- cmds, str == cmdName c ] of
            c:_ -> Just c
diff --git a/ghc/Main.hs b/ghc/Main.hs
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -85,7 +85,11 @@
    hSetBuffering stderr NoBuffering
    GHC.defaultErrorHandler defaultFatalMessager defaultFlushOut $ do
     -- 1. extract the -B flag from the args
-    argv0 <- fmap (("--interactive" :) . (("-B" ++ GHC.Paths.libdir) :)) getArgs
+    argv00 <- getArgs
+    let argv0 = ("-B" ++ GHC.Paths.libdir) :
+                if any (`elem` argv00) ["--info", "--interactive", "--make", "-c"]
+                  then argv00 -- needed for "cabal repl --with-ghc=ghci-ng"
+                  else "--interactive" : argv00
 
     let (minusB_args, argv1) = partition ("-B" `isPrefixOf`) argv0
         mbMinusB | null minusB_args = Nothing
diff --git a/ghci-ng.cabal b/ghci-ng.cabal
--- a/ghci-ng.cabal
+++ b/ghci-ng.cabal
@@ -1,5 +1,5 @@
 name: ghci-ng
-version: 7.6.3.3
+version: 7.6.3.4
 license: BSD3
 license-file: LICENSE
 author: The GHC Team
@@ -22,17 +22,22 @@
       (see <http://ghc.haskell.org/trac/ghc/ticket/5687 GHC#5687>)
     .
     * backported customizable continuation prompt (@:set prompt2@)
-      and bugfix for `:set +m`-style completion
+      and bugfix for @:set +m@-style completion
       (see <http://ghc.haskell.org/trac/ghc/ticket/8076 GHC#8076>)
     .
     * Support for @%l@ line-number prompt substitution
       (proposed for GHC 7.8, <http://ghc.haskell.org/trac/ghc/ticket/8047 GHC#8047>)
     .
-    * Add `:show linker` command to `:help` output
+    * Add @:show linker@ command to @:help@ output
       (<http://ghc.haskell.org/trac/ghc/ticket/8074 GHC#8074>)
     .
-    * Add missing `:show imports` to completion table
+    * Add missing @:show imports@ to completion table
       (<http://ghc.haskell.org/trac/ghc/ticket/8075 GHC#7075>)
+    .
+    * Fix GHCi macros not shadowing builtins
+      (<http://ghc.haskell.org/trac/ghc/ticket/8113 GHC#8113>)
+    .
+    * Supports being used via @cabal repl --with-ghc=ghci-ng@
 
 extra-source-files: ghc/HsVersions.h rts/PosixSource.h