diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 o'clock uses [PVP Versioning][1].
 The change log is available [on GitHub][2].
 
+1.0.0.1
+=======
+
+* Add support for GHC-8.6.1
+
 1.0.0
 =====
 
diff --git a/README.lhs b/README.lhs
--- a/README.lhs
+++ b/README.lhs
@@ -76,6 +76,9 @@
 ```haskell
 {-# LANGUAGE CPP              #-}
 {-# LANGUAGE DataKinds        #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType     #-}
+#endif
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies     #-}
 {-# LANGUAGE TypeOperators    #-}
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -76,6 +76,9 @@
 ```haskell
 {-# LANGUAGE CPP              #-}
 {-# LANGUAGE DataKinds        #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType     #-}
+#endif
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies     #-}
 {-# LANGUAGE TypeOperators    #-}
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/o-clock.cabal b/o-clock.cabal
--- a/o-clock.cabal
+++ b/o-clock.cabal
@@ -1,5 +1,5 @@
 name:                o-clock
-version:             1.0.0
+version:             1.0.0.1
 synopsis:            Type-safe time library.
 description:         See README.md for details.
 homepage:            https://github.com/serokell/o-clock
@@ -19,6 +19,7 @@
 tested-with:         GHC == 8.0.2
                    , GHC == 8.2.2
                    , GHC == 8.4.3
+                   , GHC == 8.6.1
 
 source-repository head
   type:     git
@@ -33,7 +34,7 @@
                          Time.Units
   ghc-options:         -Wall
   build-depends:       base         >= 4.9  && < 5
-                     , ghc-prim     >= 0.5
+                     , ghc-prim     ^>= 0.5
   default-language:    Haskell2010
   default-extensions:  OverloadedStrings
                        RecordWildCards
@@ -41,14 +42,14 @@
                        TypeApplications
                        TypeFamilies
   if flag(aeson)
-    build-depends:     aeson    >= 1.2.4
+    build-depends:     aeson    >= 1.2.4 && < 1.5
                      , text
     cpp-options:       -DHAS_aeson
   if flag(hashable)
-    build-depends:     hashable >= 1.2.6
+    build-depends:     hashable >= 1.2.6 && < 1.3
     cpp-options:       -DHAS_hashable
   if flag(deepseq)
-    build-depends:     deepseq  >= 1.4
+    build-depends:     deepseq  ^>= 1.4
     cpp-options:       -DHAS_deepseq
   if flag(serialise)
     build-depends:     serialise >= 0.2
@@ -75,9 +76,9 @@
 
   build-depends:       base            >= 4.9  && < 5
                      , o-clock
-                     , hedgehog       ^>= 0.5.1
-                     , tasty          ^>= 0.12
-                     , tasty-hedgehog ^>= 0.1
+                     , hedgehog       ^>= 0.6
+                     , tasty          >= 0.12 && < 1.2
+                     , tasty-hedgehog >= 0.1 && < 0.3
                      , tasty-hspec    ^>= 1.1.3
                      , type-spec      ^>= 0.3.0.1
 
@@ -93,8 +94,8 @@
 
   build-tool-depends:  doctest:doctest
   build-depends:       base    >= 4.10 && < 5
-                     , doctest >= 0.13
-                     , Glob    >= 0.9
+                     , doctest ^>= 0.16
+                     , Glob    ^>= 0.9
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
   default-language:    Haskell2010
 
diff --git a/src/Time/Rational.hs b/src/Time/Rational.hs
--- a/src/Time/Rational.hs
+++ b/src/Time/Rational.hs
@@ -4,6 +4,9 @@
 {-# LANGUAGE TypeInType           #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType               #-}
+#endif
 {-# LANGUAGE Rank2Types           #-}
 {-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE UndecidableInstances #-}
diff --git a/src/Time/Units.hs b/src/Time/Units.hs
--- a/src/Time/Units.hs
+++ b/src/Time/Units.hs
@@ -5,8 +5,11 @@
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE ExplicitForAll             #-}
 {-# LANGUAGE FlexibleContexts           #-}
-{-# LANGUAGE InstanceSigs               #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE InstanceSigs               #-}
+#if ( __GLASGOW_HASKELL__ >= 806 )
+{-# LANGUAGE NoStarIsType               #-}
+#endif
 {-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE UndecidableInstances       #-}