diff --git a/src/Language/Haskell/TH/Compat/Data.hs b/src/Language/Haskell/TH/Compat/Data.hs
--- a/src/Language/Haskell/TH/Compat/Data.hs
+++ b/src/Language/Haskell/TH/Compat/Data.hs
@@ -19,8 +19,10 @@
   unDataD, unNewtypeD, unDataInstD, unNewtypeInstD, unInstanceD,
   ) where
 
-#if MIN_VERSION_template_haskell(2,11,0)
+#if MIN_VERSION_template_haskell(2,12,0)
 import Language.Haskell.TH.Compat.Data.Current
+#elif MIN_VERSION_template_haskell(2,11,0)
+import Language.Haskell.TH.Compat.Data.V211
 #else
 import Language.Haskell.TH.Compat.Data.V210
 #endif
diff --git a/src/Language/Haskell/TH/Compat/Data/Current.hs b/src/Language/Haskell/TH/Compat/Data/Current.hs
--- a/src/Language/Haskell/TH/Compat/Data/Current.hs
+++ b/src/Language/Haskell/TH/Compat/Data/Current.hs
@@ -10,54 +10,62 @@
   (CxtQ, ConQ, TypeQ, DecQ,
    Cxt, Con, Type, Name, TyVarBndr, Kind,
    Dec (DataD, NewtypeD, DataInstD, NewtypeInstD, InstanceD),
-   dataD, newtypeD, dataInstD, newtypeInstD, conT)
+   DerivClauseQ, DerivClause (..), Pred,
+   dataD, newtypeD, dataInstD, newtypeInstD, derivClause, conT)
 
 
+derivesFromNames :: [Name] -> [DerivClauseQ]
+derivesFromNames ns = [derivClause Nothing $ map conT ns]
+
+unDerivClause :: DerivClause -> [Pred]
+unDerivClause (DerivClause _ ps) = ps
+
 -- | Definition against 'dataD',
 --   compatible with before temaplate-haskell-2.11
 dataD' :: CxtQ -> Name -> [TyVarBndr] -> [ConQ] -> [Name]
        -> DecQ
-dataD' cxt n bs cs ds = dataD cxt n bs Nothing cs $ mapM conT ds
+dataD' cxt n bs cs ds = dataD cxt n bs Nothing cs $ derivesFromNames ds
 
 -- | Compatible interface to destruct 'DataD'
 unDataD :: Dec -> Maybe (Cxt, Name, [TyVarBndr], Maybe Kind, [Con], [Type])
-unDataD (DataD cxt n bs mk cs ds) = Just (cxt, n, bs, mk, cs, ds)
+unDataD (DataD cxt n bs mk cs ds) = Just (cxt, n, bs, mk, cs, ds >>= unDerivClause)
 unDataD  _                        = Nothing
 
 -- | Definition against 'newtypeD',
 --   compatible with before temaplate-haskell-2.11
 newtypeD' :: CxtQ -> Name -> [TyVarBndr] -> ConQ -> [Name]
           -> DecQ
-newtypeD' cxt n bs c ds = newtypeD cxt n bs Nothing c $ mapM conT ds
+newtypeD' cxt n bs c ds = newtypeD cxt n bs Nothing c $ derivesFromNames ds
 
 -- | Compatible interface to destruct 'NewtypeD'
 unNewtypeD :: Dec -> Maybe (Cxt, Name, [TyVarBndr], Maybe Kind, Con, [Type])
-unNewtypeD (NewtypeD cxt n bs mk c ds) = Just (cxt, n, bs, mk, c, ds)
+unNewtypeD (NewtypeD cxt n bs mk c ds) = Just (cxt, n, bs, mk, c, ds >>= unDerivClause)
 unNewtypeD  _                          = Nothing
 
 -- | Definition against 'dataInstD',
 --   compatible with before temaplate-haskell-2.11
 dataInstD' :: CxtQ -> Name -> [TypeQ] -> [ConQ] -> [Name]
            -> DecQ
-dataInstD' cxt n as cs ds = dataInstD cxt n as Nothing cs $ mapM conT ds
+dataInstD' cxt n as cs ds = dataInstD cxt n as Nothing cs $ derivesFromNames ds
 
 -- | Compatible interface to destruct 'DataInstD'
 unDataInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, [Con], [Type])
-unDataInstD (DataInstD cxt n as mk cs ds) = Just (cxt, n, as, mk, cs, ds)
+unDataInstD (DataInstD cxt n as mk cs ds) = Just (cxt, n, as, mk, cs, ds >>= unDerivClause)
 unDataInstD  _                            = Nothing
 
 -- | Definition against 'newtypeInstD',
 --   compatible with before temaplate-haskell-2.11
 newtypeInstD' :: CxtQ -> Name -> [TypeQ] -> ConQ -> [Name]
               -> DecQ
-newtypeInstD' cxt n as c ds = newtypeInstD cxt n as Nothing c $ mapM conT ds
+newtypeInstD' cxt n as c ds = newtypeInstD cxt n as Nothing c $ derivesFromNames ds
 
 -- | Compatible interface to destruct 'NewtypeInstD'
 unNewtypeInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, Con, [Type])
-unNewtypeInstD (NewtypeInstD cxt n as mk c ds) = Just (cxt, n, as, mk, c, ds)
+unNewtypeInstD (NewtypeInstD cxt n as mk c ds) = Just (cxt, n, as, mk, c, ds >>= unDerivClause)
 unNewtypeInstD  _                              = Nothing
 
 -- | Compatible interface to destruct 'InstanceD'
 --   No Overlap type is defined before template-haskell-2.11.
+unInstanceD :: Dec -> Maybe (Cxt, Type, [Dec])
 unInstanceD (InstanceD _ cxt ty decs) = Just (cxt, ty, decs)
 unInstanceD  _                        = Nothing
diff --git a/src/Language/Haskell/TH/Compat/Data/V211.hs b/src/Language/Haskell/TH/Compat/Data/V211.hs
new file mode 100644
--- /dev/null
+++ b/src/Language/Haskell/TH/Compat/Data/V211.hs
@@ -0,0 +1,64 @@
+module Language.Haskell.TH.Compat.Data.V211 (
+  dataD', unDataD,
+  newtypeD', unNewtypeD,
+  dataInstD', unDataInstD,
+  newtypeInstD', unNewtypeInstD,
+  unInstanceD,
+  ) where
+
+import Language.Haskell.TH
+  (CxtQ, ConQ, TypeQ, DecQ,
+   Cxt, Con, Type, Name, TyVarBndr, Kind,
+   Dec (DataD, NewtypeD, DataInstD, NewtypeInstD, InstanceD),
+   dataD, newtypeD, dataInstD, newtypeInstD, conT)
+
+
+-- | Definition against 'dataD',
+--   compatible with before temaplate-haskell-2.11
+dataD' :: CxtQ -> Name -> [TyVarBndr] -> [ConQ] -> [Name]
+       -> DecQ
+dataD' cxt n bs cs ds = dataD cxt n bs Nothing cs $ mapM conT ds
+
+-- | Compatible interface to destruct 'DataD'
+unDataD :: Dec -> Maybe (Cxt, Name, [TyVarBndr], Maybe Kind, [Con], [Type])
+unDataD (DataD cxt n bs mk cs ds) = Just (cxt, n, bs, mk, cs, ds)
+unDataD  _                        = Nothing
+
+-- | Definition against 'newtypeD',
+--   compatible with before temaplate-haskell-2.11
+newtypeD' :: CxtQ -> Name -> [TyVarBndr] -> ConQ -> [Name]
+          -> DecQ
+newtypeD' cxt n bs c ds = newtypeD cxt n bs Nothing c $ mapM conT ds
+
+-- | Compatible interface to destruct 'NewtypeD'
+unNewtypeD :: Dec -> Maybe (Cxt, Name, [TyVarBndr], Maybe Kind, Con, [Type])
+unNewtypeD (NewtypeD cxt n bs mk c ds) = Just (cxt, n, bs, mk, c, ds)
+unNewtypeD  _                          = Nothing
+
+-- | Definition against 'dataInstD',
+--   compatible with before temaplate-haskell-2.11
+dataInstD' :: CxtQ -> Name -> [TypeQ] -> [ConQ] -> [Name]
+           -> DecQ
+dataInstD' cxt n as cs ds = dataInstD cxt n as Nothing cs $ mapM conT ds
+
+-- | Compatible interface to destruct 'DataInstD'
+unDataInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, [Con], [Type])
+unDataInstD (DataInstD cxt n as mk cs ds) = Just (cxt, n, as, mk, cs, ds)
+unDataInstD  _                            = Nothing
+
+-- | Definition against 'newtypeInstD',
+--   compatible with before temaplate-haskell-2.11
+newtypeInstD' :: CxtQ -> Name -> [TypeQ] -> ConQ -> [Name]
+              -> DecQ
+newtypeInstD' cxt n as c ds = newtypeInstD cxt n as Nothing c $ mapM conT ds
+
+-- | Compatible interface to destruct 'NewtypeInstD'
+unNewtypeInstD :: Dec -> Maybe (Cxt, Name, [Type], Maybe Kind, Con, [Type])
+unNewtypeInstD (NewtypeInstD cxt n as mk c ds) = Just (cxt, n, as, mk, c, ds)
+unNewtypeInstD  _                              = Nothing
+
+-- | Compatible interface to destruct 'InstanceD'
+--   No Overlap type is defined before template-haskell-2.11.
+unInstanceD :: Dec -> Maybe (Cxt, Type, [Dec])
+unInstanceD (InstanceD _ cxt ty decs) = Just (cxt, ty, decs)
+unInstanceD  _                        = Nothing
diff --git a/th-data-compat.cabal b/th-data-compat.cabal
--- a/th-data-compat.cabal
+++ b/th-data-compat.cabal
@@ -1,6 +1,6 @@
 
 name:                th-data-compat
-version:             0.0.2.2
+version:             0.0.2.3
 synopsis:            Compatibility for data definition template of TH
 description:         This package contains wrapped name definitions of
                      data definition template
@@ -12,7 +12,8 @@
 category:            Language
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:           GHC == 8.0.1
+tested-with:           GHC == 8.2.1
+                     , GHC == 8.0.1, GHC == 8.0.2
                      , GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3
                      , GHC == 7.8.1, GHC == 7.8.2, GHC == 7.8.3, GHC == 7.8.4
                      , GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3
@@ -22,6 +23,10 @@
   description: If true, use template-haskell 2.10 or older, otherwise use template-haskell 2.11 or newer.
   default:     True
 
+flag template-haskell-212
+  description: If true, use template-haskell 2.12 or newer, otherwise use template-haskell 2.11 or older.
+  default:     False
+
 library
   exposed-modules:      Language.Haskell.TH.Compat.Data
 
@@ -30,9 +35,14 @@
                           Language.Haskell.TH.Compat.Data.V210
     build-depends:        template-haskell >=2.4 && <2.11
   else
-    other-modules:
+    if flag(template-haskell-212)
+      other-modules:
                           Language.Haskell.TH.Compat.Data.Current
-    build-depends:        template-haskell >=2.11
+      build-depends:      template-haskell >=2.12
+    else
+      other-modules:
+                          Language.Haskell.TH.Compat.Data.V211
+      build-depends:      template-haskell ==2.11.*
 
   build-depends:         base <5