diff --git a/Database/PostgreSQL/Typed/Enum.hs b/Database/PostgreSQL/Typed/Enum.hs
--- a/Database/PostgreSQL/Typed/Enum.hs
+++ b/Database/PostgreSQL/Typed/Enum.hs
@@ -111,11 +111,11 @@
       [ tySynInstD ''PGRepType typt typl
       ]
     , instanceD [] (TH.ConT ''PGEnum `TH.AppT` typt)
-      [ TH.FunD 'pgEnumName $ map (\(n, l) -> TH.Clause [TH.ConP n []]
+      [ TH.FunD 'pgEnumName $ map (\(n, l) -> TH.Clause [conP n []]
         (TH.NormalB $ namelit l)
         []) valn
       , TH.FunD 'pgEnumValue $ map (\(n, l) ->
-          TH.Clause [TH.ConP 'PGName [TH.ListP (map TH.LitP l)]]
+          TH.Clause [conP 'PGName [TH.ListP (map TH.LitP l)]]
             (TH.NormalB $ TH.ConE 'Just `TH.AppE` TH.ConE n)
             []) valn
           ++ [TH.Clause [TH.WildP] (TH.NormalB $ TH.ConE 'Nothing) []]
@@ -143,3 +143,8 @@
 #endif
     t
   namelit l = TH.ConE 'PGName `TH.AppE` TH.ListE (map TH.LitE l)
+  conP n p = TH.ConP n
+#if MIN_VERSION_template_haskell(2,18,0)
+    []
+#endif
+    p
diff --git a/Database/PostgreSQL/Typed/Relation.hs b/Database/PostgreSQL/Typed/Relation.hs
--- a/Database/PostgreSQL/Typed/Relation.hs
+++ b/Database/PostgreSQL/Typed/Relation.hs
@@ -86,7 +86,7 @@
       return (v, t, nn))
     cold
   let typl = TH.LitT (TH.StrTyLit $ pgNameString pgid)
-      encfun f = TH.FunD f [TH.Clause [TH.WildP, TH.ConP typn (map (\(v, _, _) -> TH.VarP v) cols)]
+      encfun f = TH.FunD f [TH.Clause [TH.WildP, conP typn (map (\(v, _, _) -> TH.VarP v) cols)]
         (TH.NormalB $ pgcall f rect `TH.AppE`
           (TH.ConE 'PGRecord `TH.AppE` TH.ListE (map (colenc f) cols)))
         [] ]
@@ -124,7 +124,7 @@
       [ TH.FunD 'pgDecode [TH.Clause [TH.WildP, TH.VarP dv]
         (TH.GuardedB
           [ (TH.PatG [TH.BindS
-              (TH.ConP 'PGRecord [TH.ListP $ map colpat cols])
+              (conP 'PGRecord [TH.ListP $ map colpat cols])
               (pgcall 'pgDecode rect `TH.AppE` TH.VarE dv)]
             , foldl (\f -> TH.AppE f . coldec) (TH.ConE typn) cols)
           , (TH.NormalG (TH.ConE 'True)
@@ -137,7 +137,7 @@
       [ TH.FunD 'pgDecode [TH.Clause [TH.WildP, TH.VarP dv]
         (TH.GuardedB
           [ (TH.PatG [TH.BindS
-              (TH.ConP 'PGRecord [TH.ListP $ map colpat cols])
+              (conP 'PGRecord [TH.ListP $ map colpat cols])
               (pgcall 'pgDecode rect `TH.AppE` TH.VarE dv)]
             , TH.ConE 'Just `TH.AppE` foldl (\f -> TH.AppE f . coldec) (TH.ConE typn) cols)
           , (TH.NormalG (TH.ConE 'True)
@@ -145,13 +145,13 @@
           ])
         [] ]
       , TH.FunD 'pgDecodeValue
-        [ TH.Clause [TH.WildP, TH.WildP, TH.ConP 'PGNullValue []]
+        [ TH.Clause [TH.WildP, TH.WildP, conP 'PGNullValue []]
           (TH.NormalB $ TH.ConE 'Nothing)
           []
-        , TH.Clause [TH.WildP, TH.VarP tv, TH.ConP 'PGTextValue [TH.VarP dv]]
+        , TH.Clause [TH.WildP, TH.VarP tv, conP 'PGTextValue [TH.VarP dv]]
           (TH.NormalB $ TH.VarE 'pgDecode `TH.AppE` TH.VarE tv `TH.AppE` TH.VarE dv)
           []
-        , TH.Clause [TH.VarP ev, TH.VarP tv, TH.ConP 'PGBinaryValue [TH.VarP dv]]
+        , TH.Clause [TH.VarP ev, TH.VarP tv, conP 'PGBinaryValue [TH.VarP dv]]
           (TH.NormalB $ TH.VarE 'pgDecodeBinary `TH.AppE` TH.VarE ev `TH.AppE` TH.VarE tv `TH.AppE` TH.VarE dv)
           []
         ]
@@ -176,7 +176,7 @@
         (TH.ConT (TH.tupleTypeName (length cols)))
         cols `TH.AppT` typt
     , TH.FunD (TH.mkName ("uncurry" ++ typs))
-      [ TH.Clause [TH.ConP (TH.tupleDataName (length cols)) (map (\(v, _, _) -> TH.VarP v) cols)]
+      [ TH.Clause [conP (TH.tupleDataName (length cols)) (map (\(v, _, _) -> TH.VarP v) cols)]
         (TH.NormalB $ foldl (\f (v, _, _) -> f `TH.AppE` TH.VarE v) (TH.ConE typn) cols)
         []
       ]
@@ -203,10 +203,15 @@
       (TH.ConT ''PGTypeID `TH.AppT` t))
   colenc f (v, t, False) = TH.ConE 'Just `TH.AppE` (pgcall f t `TH.AppE` TH.VarE v)
   colenc f (v, t, True) = TH.VarE 'fmap `TH.AppE` pgcall f t `TH.AppE` TH.VarE v
-  colpat (v, _, False) = TH.ConP 'Just [TH.VarP v]
+  colpat (v, _, False) = conP 'Just [TH.VarP v]
   colpat (v, _, True) = TH.VarP v
   coldec (v, t, False) = pgcall 'pgDecode t `TH.AppE` TH.VarE v
   coldec (v, t, True) = TH.VarE 'fmap `TH.AppE` pgcall 'pgDecode t `TH.AppE` TH.VarE v
   rect = TH.LitT $ TH.StrTyLit "record"
   namelit n = TH.ConE 'PGName `TH.AppE`
     TH.ListE (map (TH.LitE . TH.IntegerL . fromIntegral) $ pgNameBytes n)
+  conP n p = TH.ConP n
+#if MIN_VERSION_template_haskell(2,18,0)
+    []
+#endif
+    p
diff --git a/postgresql-typed.cabal b/postgresql-typed.cabal
--- a/postgresql-typed.cabal
+++ b/postgresql-typed.cabal
@@ -1,5 +1,5 @@
 Name:          postgresql-typed
-Version:       0.6.2.0
+Version:       0.6.2.1
 Cabal-Version: >= 1.10
 License:       BSD3
 License-File:  COPYING