diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 CHANGELOG for MiniAgda
 
+0.2019.3.29   Bumped haskell-src-exts to 1.21
+
 0.2018.11.6   Tested compilation with 8.6.2.
 
 0.2018.11.4   Fixed compilation with ghc 8.4 and 8.6.
diff --git a/MiniAgda.cabal b/MiniAgda.cabal
--- a/MiniAgda.cabal
+++ b/MiniAgda.cabal
@@ -1,5 +1,5 @@
 name:            MiniAgda
-version:         0.2018.11.6
+version:         0.2019.3.29
 build-type:      Simple
 cabal-version:   1.24
 license:         OtherLicense
@@ -28,7 +28,7 @@
                     GHC == 8.0.2
                     GHC == 8.2.2
                     GHC == 8.4.4
-                    GHC == 8.6.2
+                    GHC == 8.6.4
 
 extra-source-files: Makefile
                     CHANGELOG
@@ -51,9 +51,11 @@
   build-depends:    array >= 0.3 && < 0.6,
                     base >= 4.6 && < 5,
                     containers >= 0.3 && < 0.6,
-                    haskell-src-exts >= 1.20 && < 2.0,
+                    haskell-src-exts >= 1.21 && < 1.22,
                     mtl >= 2.2.2 && < 2.3,
                     pretty >= 1.0 && < 1.2
+  -- haskell-src-exts is a nervous package with incompatibilities
+  -- in every new version, thus, we need tight bounds.
   build-tools:      happy >= 1.15 && < 2,
                     alex >= 3.0 && < 4
   default-language: Haskell98
diff --git a/src/HsSyntax.hs b/src/HsSyntax.hs
--- a/src/HsSyntax.hs
+++ b/src/HsSyntax.hs
@@ -40,7 +40,7 @@
 hTyCon        = H.TyCon ()
 hTyApp        = H.TyApp ()
 hDataType     = H.DataType ()
-hKindFn       = H.KindFn ()
+hKindFn       = H.TyFun () -- H.KindFn ()
 hTyTuple      = H.TyTuple ()
 hTyFun        = H.TyFun ()
 hTyForall     = H.TyForall ()
@@ -54,7 +54,7 @@
 hPVar         = H.PVar ()
 hPApp         = H.PApp ()
 hPTuple       = H.PTuple ()
-hKindStar     = H.KindStar ()
+hKindStar     = H.TyStar () -- H.KindStar ()
 
 main_name  = H.main_name ()
 main_mod   = H.main_mod ()
@@ -110,7 +110,7 @@
     (Just k) cs [showDeriving]
 
 mkConDecl :: Name -> Type -> GadtDecl
-mkConDecl n t = H.GadtDecl noLoc n Nothing t
+mkConDecl n t = H.GadtDecl noLoc n Nothing Nothing Nothing t
 
 mkKindFun :: Kind -> Kind -> Kind
 mkKindFun = hKindFn