diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@
 Policy (PVP)](https://pvp.haskell.org)
 
 
+## [0.6.0.0] - 2020-08-26
+### Added
+  * Added support for Cabal-3
+
+### Fixed
+  * Fixed linking with CUDA-10.x
+
 ## [0.5.0.0] - 2018-10-02
 ### Added
   * `gemm[Strided]BatchedEx` from CUDA-9.1
@@ -29,6 +36,7 @@
 * First version; replaces [bmsherman/cublas](https://github.com/bmsherman/cublas). Released on an unsuspecting world.
 
 
+[0.6.0.0]:          https://github.com/tmcdonell/cublas/compare/release/v0.5.0.0...v0.6.0.0
 [0.5.0.0]:          https://github.com/tmcdonell/cublas/compare/release/0.4.0.1...v0.5.0.0
 [0.4.0.1]:          https://github.com/tmcdonell/cublas/compare/release/0.4.0.0...0.4.0.1
 [0.4.0.0]:          https://github.com/tmcdonell/cublas/compare/release/0.3.0.0...0.4.0.0
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -27,6 +27,7 @@
 #endif
 
 import Foreign.CUDA.Path
+import Foreign.CUDA.Driver.Utils
 import System.Directory
 import System.FilePath
 import Text.Printf
@@ -50,6 +51,9 @@
   case os of
     Windows -> dynamicLibs platform
     _       -> ["cublas_static", "culibos", "cudart_static", "pthread", "dl"]
+            ++ if libraryVersion > 10000
+                  then ["cublasLt_static"]
+                  else []
 
 dynamicLibs :: Platform -> [String]
 dynamicLibs _ = ["cublas"]
@@ -151,7 +155,11 @@
     , extraLibs      = extraLibs'
     , extraGHCiLibs  = extraGHCiLibs'
     , extraLibDirs   = extraLibDirs'
-    , options        = [(GHC, ghcOptions) | os /= Windows]
+#if MIN_VERSION_Cabal(3,0,0)
+    , options             = PerCompilerFlavor (if os /= Windows then ghcOptions else []) []
+#else
+    , options             = [(GHC, ghcOptions) | os /= Windows]
+#endif
     , customFieldsBI = [c2hsExtraOptions]
     }
 
diff --git a/cublas.cabal b/cublas.cabal
--- a/cublas.cabal
+++ b/cublas.cabal
@@ -1,5 +1,5 @@
 name:                   cublas
-version:                0.5.0.0
+version:                0.6.0.0
 synopsis:               FFI bindings to the CUDA BLAS library
 description:
     The cuBLAS library is an implementation of BLAS (Basic Linear Algebra
@@ -16,7 +16,7 @@
 license-file:           LICENSE
 author:                 Trevor L. McDonell, Ben Sherman
 maintainer:             Trevor L. McDonell <trevor.mcdonell@gmail.com>
-copyright:              Copyright (c) [2012..2017]. Trevor L. McDonell <trevor.mcdonell@gmail.com>, Ben Sherman <benmsherman@gmail.com>
+copyright:              Copyright (c) [2012..2018]. Trevor L. McDonell <trevor.mcdonell@gmail.com>
 category:               Foreign
 cabal-version:          >=1.24
 
@@ -79,6 +79,6 @@
 source-repository this
     type:               git
     location:           https://github.com/tmcdonell/cublas
-    tag:                v0.5.0.0
+    tag:                v0.6.0.0
 
 -- vim: nospell