diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,33 +1,6 @@
-{-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -Wall #-}
 module Main (main) where
 
-#ifndef MIN_VERSION_cabal_doctest
-#define MIN_VERSION_cabal_doctest(x,y,z) 0
-#endif
-
-#if MIN_VERSION_cabal_doctest(1,0,0)
-
-import Distribution.Extra.Doctest ( defaultMainAutoconfWithDoctests )
-main :: IO ()
-main = defaultMainAutoconfWithDoctests "doctests"
-
-#else
-
-#ifdef MIN_VERSION_Cabal
--- If the macro is defined, we have new cabal-install,
--- but for some reason we don't have cabal-doctest in package-db
---
--- Probably we are running cabal sdist, when otherwise using new-build
--- workflow
-#warning You are configuring this package without cabal-doctest installed. \
-         The doctests test-suite will not work as a result. \
-         To fix this, install cabal-doctest before configuring.
-#endif
-
 import Distribution.Simple
 
 main :: IO ()
-main = defaultMain
-
-#endif
+main = defaultMainWithHooks autoconfUserHooks
diff --git a/unix-time.cabal b/unix-time.cabal
--- a/unix-time.cabal
+++ b/unix-time.cabal
@@ -1,5 +1,5 @@
 Name:                   unix-time
-Version:                0.4.4
+Version:                0.4.5
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -7,8 +7,8 @@
 Synopsis:               Unix time parser/formatter and utilities
 Description:            Fast parser\/formatter\/utilities for Unix time
 Category:               Data
-Cabal-Version:          >= 1.10
-Build-Type:             Custom
+Cabal-Version:          1.18
+Build-Type:             Configure
 Extra-Source-Files:     cbits/config.h.in
                         cbits/conv.c
                         cbits/strftime.c
@@ -19,9 +19,6 @@
                         configure.ac
 Extra-Tmp-Files:        config.log config.status autom4te.cache cbits/config.h
 
-Custom-Setup
-  Setup-Depends:        base, Cabal, cabal-doctest >=1.0.6 && <1.1
-
 Library
   Default-Language:     Haskell2010
   GHC-Options:          -Wall
@@ -45,6 +42,7 @@
   include-dirs:         cbits
 
 Test-Suite doctests
+  Buildable:            False
   Type:                 exitcode-stdio-1.0
   Default-Language:     Haskell2010
   HS-Source-Dirs:       test
@@ -61,14 +59,15 @@
   Ghc-Options:          -Wall
   Main-Is:              Spec.hs
   Other-Modules:        UnixTimeSpec
+  Build-Tools:          hspec-discover >= 2.6
   Build-Depends:        base
                       , bytestring
-                      , hspec >= 1.5
                       , old-locale
                       , old-time
                       , QuickCheck
                       , time
                       , unix-time
+                      , hspec >= 2.6
 
 Source-Repository head
   Type:                 git