diff --git a/CHANGES.txt b/CHANGES.txt
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
 Changelog for Derive
 
+2.5.22
+    #7, #8 convert more types from TemplateHaskell
 2.5.21
     Fix the homepage link
 2.5.20
diff --git a/Data/Derive/Internal/Traversal.hs b/Data/Derive/Internal/Traversal.hs
--- a/Data/Derive/Internal/Traversal.hs
+++ b/Data/Derive/Internal/Traversal.hs
@@ -28,6 +28,7 @@
 import Control.Applicative
 import Data.Generics.Uniplate.DataOnly
 import Data.Maybe
+import Prelude
 
 ---------------------------------------------------------------------------------
 -- Information datatype, public interface
diff --git a/Language/Haskell/Convert.hs b/Language/Haskell/Convert.hs
--- a/Language/Haskell/Convert.hs
+++ b/Language/Haskell/Convert.hs
@@ -75,7 +75,9 @@
     conv (ConT x) | ',' `elem` show x = TyTuple Boxed []
                   | otherwise = TyCon $ c x
     conv (AppT (AppT ArrowT x) y) = TyFun (c x) (c y)
+    conv (ArrowT) = TyCon $ Special FunCon
     conv (AppT ListT x) = TyList $ c x
+    conv (ListT) = TyCon $ Special ListCon
     conv (TupleT _) = TyTuple Boxed []
     conv (AppT x y) = case c x of
         TyTuple b xs -> TyTuple b $ xs ++ [c y]
diff --git a/derive.cabal b/derive.cabal
--- a/derive.cabal
+++ b/derive.cabal
@@ -1,7 +1,7 @@
 cabal-version:  >= 1.6
 build-type:     Default
 name:           derive
-version:        2.5.21
+version:        2.5.22
 build-type:     Simple
 copyright:      Neil Mitchell 2006-2015
 author:         Neil Mitchell <ndmitchell@gmail.com>
@@ -20,7 +20,7 @@
 extra-source-files:
     README.md
     CHANGES.txt
-tested-with:        GHC==7.10.1, GHC==7.8.3, GHC==7.6.3, GHC==7.4.2
+tested-with:        GHC==7.10.1, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
 
 source-repository head
     type:     git