diff --git a/lib/Pinchot/Earley.hs b/lib/Pinchot/Earley.hs
--- a/lib/Pinchot/Earley.hs
+++ b/lib/Pinchot/Earley.hs
@@ -160,7 +160,7 @@
 -- This always creates a single product type whose name is
 -- @Productions@; currently the name cannot be configured.
 --
--- Example: "Pinchot.Examples.SyntaxTrees".
+-- Example: "Pinchot.Examples.AllRulesRecord".
 allRulesRecord
   :: Qualifier
   -- ^ Qualifier for data types corresponding to those created from
diff --git a/newTemplateHaskell/Pinchot/Internal/TemplateHaskellShim.hs b/newTemplateHaskell/Pinchot/Internal/TemplateHaskellShim.hs
new file mode 100644
--- /dev/null
+++ b/newTemplateHaskell/Pinchot/Internal/TemplateHaskellShim.hs
@@ -0,0 +1,18 @@
+-- | A compatibility shim so Pinchot can work with versions of the
+-- template-haskell library both before and after version 2.11.
+-- The .cabal file is set up so this version of this module is used
+-- for 2.11 and newer versions of template-haskell.
+
+module Pinchot.Internal.TemplateHaskellShim where
+
+import qualified Language.Haskell.TH as T
+
+newtypeD
+  :: T.CxtQ -> T.Name -> [T.TyVarBndr] -> T.ConQ -> [T.Name] -> T.DecQ
+newtypeD cxt name tyVars ctor derives
+  = T.newtypeD cxt name tyVars Nothing ctor (return $ fmap T.ConT derives)
+
+dataD
+  :: T.CxtQ -> T.Name -> [T.TyVarBndr] -> [T.ConQ] -> [T.Name] -> T.DecQ
+dataD cxt name tyVars ctors derives
+  = T.dataD cxt name tyVars Nothing ctors (return $ fmap T.ConT derives)
diff --git a/pinchot.cabal b/pinchot.cabal
--- a/pinchot.cabal
+++ b/pinchot.cabal
@@ -3,11 +3,11 @@
 -- http://www.github.com/massysett/cartel
 --
 -- Script name used to generate: genCabal.hs
--- Generated on: 2016-04-30 09:55:17.798604 EDT
+-- Generated on: 2016-05-28 17:51:51.135563 EDT
 -- Cartel library version: 0.16.0.0
 
 name: pinchot
-version: 0.18.0.0
+version: 0.18.0.2
 cabal-version: >= 1.14
 license: BSD3
 license-file: LICENSE
@@ -28,6 +28,8 @@
   For more documentation, see the Haddocks for the main Pinchot module.
 category: Development
 extra-source-files:
+  "newTemplateHaskell/Pinchot/Internal/TemplateHaskellShim.hs"
+  "oldTemplateHaskell/Pinchot/Internal/TemplateHaskellShim.hs"
   README
 
 Library