diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Tom Sydney Kerckhove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+
+main = defaultMain
diff --git a/genvalidity-time.cabal b/genvalidity-time.cabal
new file mode 100644
--- /dev/null
+++ b/genvalidity-time.cabal
@@ -0,0 +1,48 @@
+name: genvalidity-time
+version: 0.0.0.0
+cabal-version: >=1.10
+build-type: Simple
+license: MIT
+license-file: LICENSE
+copyright: Copyright: (c) 2017 Tom Sydney Kerckhove
+maintainer: syd.kerckhove@gmail.com
+homepage: https://github.com/NorfairKing/validity#readme
+synopsis: GenValidity support for time
+description:
+    Please see README.md
+category: Testing
+author: Tom Sydney Kerckhove
+
+source-repository head
+    type: git
+    location: https://github.com/NorfairKing/validity
+
+library
+    exposed-modules:
+        Data.GenValidity.Time
+        Data.GenValidity.Time.Calendar
+        Data.GenValidity.Time.Clock
+        Data.GenValidity.Time.Format
+        Data.GenValidity.Time.LocalTime
+    build-depends:
+        base <5,
+        validity-time >=0.0 && <0.1,
+        genvalidity >=0.3.0.1 && <0.4,
+        time
+    default-language: Haskell2010
+    hs-source-dirs: src
+
+test-suite genvalidity-time-test
+    type: exitcode-stdio-1.0
+    main-is: Spec.hs
+    build-depends:
+        base -any,
+        genvalidity-time -any,
+        hspec -any,
+        genvalidity-hspec -any,
+        time -any
+    default-language: Haskell2010
+    hs-source-dirs: test
+    other-modules:
+        Data.GenValidity.TimeSpec
+    ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -fno-warn-name-shadowing
diff --git a/src/Data/GenValidity/Time.hs b/src/Data/GenValidity/Time.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Time.hs
@@ -0,0 +1,10 @@
+{-# OPTIONS_GHC -Wno-dodgy-exports #-}
+
+module Data.GenValidity.Time
+    ( module X
+    ) where
+
+import qualified Data.GenValidity.Time.Calendar as X ()
+import qualified Data.GenValidity.Time.Clock as X ()
+import qualified Data.GenValidity.Time.Format as X ()
+import qualified Data.GenValidity.Time.LocalTime as X ()
diff --git a/src/Data/GenValidity/Time/Calendar.hs b/src/Data/GenValidity/Time/Calendar.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Time/Calendar.hs
@@ -0,0 +1,12 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Data.GenValidity.Time.Calendar where
+
+import Data.GenValidity
+import Data.Time.Calendar
+import Data.Validity.Time.Calendar ()
+
+instance GenUnchecked Day where
+    genUnchecked = ModifiedJulianDay <$> genUnchecked
+
+instance GenValid Day
diff --git a/src/Data/GenValidity/Time/Clock.hs b/src/Data/GenValidity/Time/Clock.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Time/Clock.hs
@@ -0,0 +1,30 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Data.GenValidity.Time.Clock where
+
+import Data.GenValidity
+import Data.GenValidity.Time.Calendar ()
+import Data.Time.Clock
+import Data.Validity.Time.Clock ()
+
+instance GenUnchecked UniversalTime where
+    genUnchecked = ModJulianDate <$> genUnchecked
+
+instance GenValid UniversalTime
+
+instance GenUnchecked DiffTime where
+    genUnchecked = picosecondsToDiffTime <$> genUnchecked
+
+instance GenValid DiffTime
+
+instance GenUnchecked UTCTime where
+    genUnchecked = UTCTime <$> genUnchecked <*> genUnchecked
+
+instance GenValid UTCTime
+
+instance GenInvalid UTCTime
+
+instance GenUnchecked NominalDiffTime where
+    genUnchecked = (fromIntegral :: Integer -> NominalDiffTime) <$> genUnchecked
+
+instance GenValid NominalDiffTime
diff --git a/src/Data/GenValidity/Time/Format.hs b/src/Data/GenValidity/Time/Format.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Time/Format.hs
@@ -0,0 +1,19 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Data.GenValidity.Time.Format where
+
+import Data.GenValidity
+import Data.GenValidity.Time.LocalTime ()
+import Data.Time.Format
+import Data.Validity.Time.Format ()
+
+instance GenUnchecked TimeLocale where
+    genUnchecked =
+        TimeLocale <$> genUnchecked <*> genUnchecked <*> genUnchecked <*>
+        genUnchecked <*>
+        genUnchecked <*>
+        genUnchecked <*>
+        genUnchecked <*>
+        genUnchecked
+
+instance GenValid TimeLocale
diff --git a/src/Data/GenValidity/Time/LocalTime.hs b/src/Data/GenValidity/Time/LocalTime.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Time/LocalTime.hs
@@ -0,0 +1,34 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Data.GenValidity.Time.LocalTime where
+
+import Data.GenValidity
+import Data.GenValidity.Time.Calendar ()
+import Data.Time.LocalTime
+import Data.Validity.Time.LocalTime ()
+
+instance GenUnchecked TimeZone where
+    genUnchecked = TimeZone <$> genUnchecked <*> genUnchecked <*> genUnchecked
+
+instance GenValid TimeZone
+
+instance GenUnchecked TimeOfDay where
+    genUnchecked = TimeOfDay <$> genUnchecked <*> genUnchecked <*> genUnchecked
+
+instance GenValid TimeOfDay
+
+instance GenInvalid TimeOfDay
+
+instance GenUnchecked LocalTime where
+    genUnchecked = LocalTime <$> genUnchecked <*> genUnchecked
+
+instance GenValid LocalTime
+
+instance GenInvalid LocalTime
+
+instance GenUnchecked ZonedTime where
+    genUnchecked = ZonedTime <$> genUnchecked <*> genUnchecked
+
+instance GenValid ZonedTime
+
+instance GenInvalid ZonedTime
diff --git a/test/Data/GenValidity/TimeSpec.hs b/test/Data/GenValidity/TimeSpec.hs
new file mode 100644
--- /dev/null
+++ b/test/Data/GenValidity/TimeSpec.hs
@@ -0,0 +1,24 @@
+{-# LANGUAGE TypeApplications #-}
+
+module Data.GenValidity.TimeSpec
+    ( spec
+    ) where
+
+import Test.Hspec
+import Test.Validity
+
+import Data.GenValidity.Time ()
+import Data.Time
+
+spec :: Spec
+spec = do
+    genValidSpec @Day
+    genValidSpec @UniversalTime
+    genValidSpec @DiffTime
+    genValiditySpec @UTCTime
+    genValidSpec @NominalDiffTime
+    genValidSpec @TimeZone
+    genValiditySpec @TimeOfDay
+    genValiditySpec @LocalTime
+    genValiditySpec @ZonedTime
+    genValidSpec @TimeLocale
diff --git a/test/Spec.hs b/test/Spec.hs
new file mode 100644
--- /dev/null
+++ b/test/Spec.hs
@@ -0,0 +1,1 @@
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}