diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,14 @@
 
 Version history.
 
-## 0.1.5.2 (2021-09-10)
+## 0.1.5.3 Andreas Abel 2022-01-10
 
-- Support GHC 8.10.7.
+- Fixed #6: build failure with GHC 9.0.2.
+- Tested with GHC 8.0.2 - 9.0.2.
+
+## 0.1.5.2 Andrés Sicard Ramirez 2021-09-10
+
+- `stack.yaml` file for GHC 8.10.7.
 
 ## 0.1.5.1 Andreas Abel 2021-08-22
 
diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -51,7 +51,7 @@
 import GHC.Driver.Monad      ( GhcT(..), Ghc(..) )
 import GHC.Driver.Phases     ( pattern Cpp, pattern HsSrcFile )
 import GHC.Driver.Pipeline   ( preprocess )
-import GHC.Driver.Session    ( pattern IncludeSpecs, opt_P, parseDynamicFilePragma, sOpt_P, toolSettings )
+import GHC.Driver.Session    ( includePathsGlobal, opt_P, parseDynamicFilePragma, sOpt_P, toolSettings )
 import GHC.Parser            ( parseModule )
 import GHC.Parser.Lexer      ( P(..), ParseResult(..), PState, mkPState, getErrorMessages )
 import GHC.Settings          ( toolSettings_opt_P )
@@ -76,7 +76,7 @@
 import StringBuffer   ( hGetStringBuffer )
 
 #if MIN_VERSION_ghc(8,6,1)
-import DynFlags       ( pattern IncludeSpecs )
+import DynFlags       ( includePathsGlobal )
 #endif
 
 #if MIN_VERSION_ghc(8,10,1)
@@ -236,8 +236,9 @@
 #endif
 
 #if MIN_VERSION_ghc(8,6,1)
-                    , includePaths = case includePaths dynFlags of
-                                       IncludeSpecs qs gs -> IncludeSpecs qs (optIncludePath opts ++ gs)
+                    , includePaths =
+                        let includeSpecs = includePaths dynFlags
+                        in  includeSpecs { includePathsGlobal = optIncludePath opts ++ includePathsGlobal includeSpecs }
 #else
                     , includePaths = optIncludePath opts ++ includePaths dynFlags
 #endif
diff --git a/hs-tags.cabal b/hs-tags.cabal
--- a/hs-tags.cabal
+++ b/hs-tags.cabal
@@ -1,10 +1,10 @@
 name:            hs-tags
-version:         0.1.5.2
+version:         0.1.5.3
 cabal-version:   >= 1.10
 build-type:      Simple
 license:         MIT
 license-file:    LICENSE
-copyright:       (c) 2005-2021 The Agda Team.
+copyright:       (c) 2005-2022 The Agda Team.
 author:          Ulf Norell, Nils Anders Danielsson, Andrés Sicard-Ramírez, Andreas Abel, Francesco Mazzoli, Paolo G. Giarrusso
 maintainer:      Andreas Abel <andreas.abel@gu.se>
 bug-reports:     https://github.com/agda/hs-tags/issues
@@ -24,6 +24,7 @@
   GHC == 8.8.4
   GHC == 8.10.7
   GHC == 9.0.1
+  GHC == 9.0.2
 
 extra-source-files:
   CHANGELOG.md
@@ -43,7 +44,7 @@
 source-repository this
   type:     git
   location: https://github.com/agda/hs-tags.git
-  tag:      v0.1.5.2
+  tag:      v0.1.5.3
 
 executable hs-tags
   main-is:          Main.hs