diff --git a/Language/Haskell/TH/ExpandSyns.hs b/Language/Haskell/TH/ExpandSyns.hs
--- a/Language/Haskell/TH/ExpandSyns.hs
+++ b/Language/Haskell/TH/ExpandSyns.hs
@@ -13,6 +13,11 @@
 import Data.Generics
 import Control.Monad
 
+-- For ghci
+#ifndef MIN_VERSION_template_haskell
+#define MIN_VERSION_template_haskell(X,Y,Z) 1
+#endif
+
 packagename :: String
 packagename = "th-expand-syns"
     
@@ -23,7 +28,7 @@
 bindPred :: (Type -> Q Type) -> Pred -> Q Pred
 tyVarBndrSetName :: Name -> TyVarBndr -> TyVarBndr
                    
-#if __GLASGOW_HASKELL__ >= 611
+#if MIN_VERSION_template_haskell(2,4,0)
 tyVarBndrGetName (PlainTV n) = n
 tyVarBndrGetName (KindedTV n _) = n
                                 
@@ -77,7 +82,7 @@
 decIsSyn (DataD {}) = return Nothing
 decIsSyn (NewtypeD {}) = return Nothing
 decIsSyn (TySynD _ vars t) = return (Just (tyVarBndrGetName <$> vars,t))
-#if __GLASGOW_HASKELL__ >= 611
+#if MIN_VERSION_template_haskell(2,4,0)
 decIsSyn (FamilyD _ name _ _) = do
     warn ("Type families (data families, newtype families, associated types and type synonym families) are currently not supported (they won't be expanded). Name of unsupported family: "++show name) 
     return Nothing
@@ -133,13 +138,17 @@
                         go (drop (length vars) acc) expanded
                         
 
-#if __GLASGOW_HASKELL__ >= 611
+#if MIN_VERSION_template_haskell(2,4,0)
       go acc (SigT t kind) = 
           do
             (acc',t') <- go acc t
             return (acc',SigT t' kind)
 #endif
 
+#if MIN_VERSION_template_haskell(2,6,0)
+      go acc x@(UnboxedTupleT _) = return (acc, x)
+#endif
+
 class SubstTypeVariable a where
     -- | Capture-free substitution
     subst :: (Name, Type) -> a -> a
@@ -160,10 +169,14 @@
                         
       go s@(TupleT _) = s
                         
-#if __GLASGOW_HASKELL__ >= 611
+#if MIN_VERSION_template_haskell(2,4,0)
       go (SigT t1 kind) = SigT (go t1) kind
 #endif
 
+#if MIN_VERSION_template_haskell(2,6,0)
+      go s@(UnboxedTupleT _) = s
+#endif
+
 -- testCapture :: Type
 -- testCapture = 
 --     let 
@@ -177,7 +190,7 @@
 --                    (v "x" `AppT` v "y"))
 
                         
-#if __GLASGOW_HASKELL__ >= 611
+#if MIN_VERSION_template_haskell(2,4,0)
 instance SubstTypeVariable Pred where
     subst s = mapPred (subst s)
 #endif
diff --git a/th-expand-syns.cabal b/th-expand-syns.cabal
--- a/th-expand-syns.cabal
+++ b/th-expand-syns.cabal
@@ -1,5 +1,5 @@
 name:                th-expand-syns
-version:             0.3.0.1
+version:             0.3.0.2
 synopsis:            Expands type synonyms in Template Haskell ASTs
 description:         Expands type synonyms in Template Haskell ASTs
 category:            Template Haskell