diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.4.1.1
+-------
+
+* Allow cookie <0.5
+* Change to `build-type: Simple`
+
 0.4.1
 -----
 
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/Setup.lhs b/Setup.lhs
deleted file mode 100644
--- a/Setup.lhs
+++ /dev/null
@@ -1,36 +0,0 @@
-\begin{code}
-{-# 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 ( defaultMainWithDoctests )
-main :: IO ()
-main = defaultMainWithDoctests "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
-
-\end{code}
diff --git a/http-api-data.cabal b/http-api-data.cabal
--- a/http-api-data.cabal
+++ b/http-api-data.cabal
@@ -1,6 +1,6 @@
 cabal-version:   >= 1.10
 name:            http-api-data
-version:         0.4.1
+version:         0.4.1.1
 
 synopsis:        Converting to/from HTTP API data like URL pieces, headers and query parameters.
 category:        Web
@@ -15,7 +15,7 @@
 maintainer:      Nickolay Kudasov <nickolay.kudasov@gmail.com>
 homepage:        http://github.com/fizruk/http-api-data
 stability:       unstable
-build-type:      Custom
+build-type:      Simple
 
 extra-source-files:
   include/overlapping-compat.h
@@ -32,12 +32,6 @@
   GHC==8.6.5,
   GHC==8.8.1
 
-custom-setup
-  setup-depends:
-    base,
-    Cabal,
-    cabal-doctest >=1.0.6 && <1.1
-
 flag use-text-show
   description: Use text-show library for efficient ToHttpApiData implementations.
   default: False
@@ -48,7 +42,7 @@
     include-dirs:   include/
 
     -- GHC bundled
-    build-depends:   base                  >= 4.7      && < 4.13
+    build-depends:   base                  >= 4.7      && < 4.14
                    , bytestring            >= 0.10.4.0 && < 0.11
                    , containers            >= 0.5.5.1  && < 0.7
                    , text                  >= 1.2.3.0  && < 1.3
@@ -61,8 +55,8 @@
     build-depends:
                      attoparsec            >= 0.13.2.2 && < 0.14
                    , attoparsec-iso8601    >= 1.0.1.0  && < 1.1
-                   , base-compat           >= 0.10.5   && < 0.11
-                   , cookie                >= 0.4.3    && < 0.4.5
+                   , base-compat           >= 0.10.5   && < 0.12
+                   , cookie                >= 0.4.3    && < 0.5
                    , hashable              >= 1.2.7.0  && < 1.4
                    , http-types            >= 0.12.3   && < 0.13
                    , tagged                >= 0.8.5    && < 0.9
@@ -118,18 +112,6 @@
                    , hspec                >= 2.7.1   && <2.8
                    , QuickCheck           >= 2.13.1  && <2.14
                    , quickcheck-instances >= 0.3.21  && <0.4
-
-test-suite doctests
-  ghc-options:      -Wall
-  build-depends:
-    base,
-    directory >= 1.0,
-    doctest >= 0.16.0 && <0.17,
-    filepath
-  default-language: Haskell2010
-  hs-source-dirs:   test
-  main-is:          doctests.hs
-  type:             exitcode-stdio-1.0
 
 source-repository head
   type:     git
diff --git a/test/doctests.hs b/test/doctests.hs
deleted file mode 100644
--- a/test/doctests.hs
+++ /dev/null
@@ -1,25 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Main (doctests)
--- Copyright   :  (C) 2012-14 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  provisional
--- Portability :  portable
---
--- This module provides doctests for a project based on the actual versions
--- of the packages it was built with. It requires a corresponding Setup.lhs
--- to be added to the project
------------------------------------------------------------------------------
-module Main where
-
-import Build_doctests (flags, pkgs, module_sources)
-import Data.Foldable (traverse_)
-import Test.DocTest
-
-main :: IO ()
-main = do
-    traverse_ putStrLn args
-    doctest args
-  where
-    args = flags ++ pkgs ++ module_sources