diff --git a/Types/Data/Bool.hs b/Types/Data/Bool.hs
--- a/Types/Data/Bool.hs
+++ b/Types/Data/Bool.hs
@@ -50,13 +50,13 @@
 type family x :&&: y
 type instance False :&&: x = False
 type instance True  :&&: x = x
-andT :: x -> y -> x :&&: x
+andT :: x -> y -> x :&&: y
 andT _ _ = Prelude.undefined
 
 type family x :||: y
 type instance True  :||: x = True
 type instance False :||: x = x
-orT :: x -> y -> x :||: x
+orT :: x -> y -> x :||: y
 orT _ _ = Prelude.undefined
 
 class IfT x y z where
diff --git a/tfp.cabal b/tfp.cabal
--- a/tfp.cabal
+++ b/tfp.cabal
@@ -1,15 +1,15 @@
 name:           tfp
-version:        0.2
-cabal-version:  >= 1.2
+version:        0.3
+cabal-version:  >= 1.6
 build-type:     Simple
 license:        BSD3
 license-file:   LICENSE
 copyright:      Copyright (c) 2008 Peter Gavin
 author:         Peter Gavin
 maintainer:     pgavin@gmail.com
-homepage:       http://code.haskell.org/~pgavin/tfp
+homepage:       http://abt12monk.org/git/tfp.git/
 stability:      alpha
-package-url:    http://code.haskell.org/~pgavin/tfp
+package-url:    http://abt12monk.org/git/tfp.git/
 synopsis:       Type-level programming library using type families
 description:	TFP (short for Type Family Programming) provides implementations of type-level integers and booleans,
 		and (eventually) simple type-level data structures. It uses type families as functions to produce new types,
@@ -17,6 +17,11 @@
 category:       Data
 tested-with:    GHC == 6.9.0
 
+source-repository head {
+  type:         git
+  location:     http://abt12monk.org/git/tfp.git/
+}
+
 flag build-test
   description: Build the tfp-test test program
   default: False
@@ -27,7 +32,7 @@
                   FlexibleInstances, TemplateHaskell, TypeSynonymInstances,
                   MultiParamTypeClasses, GeneralizedNewtypeDeriving,
                   Rank2Types, FlexibleContexts
-  build-depends:  base >= 3.0, template-haskell >= 2.0
+  build-depends:  base >= 3.0 && < 5, template-haskell >= 2.0
   exposed-modules:
     Data.SizedInt,
     Data.SizedWord,
@@ -59,5 +64,5 @@
                   MultiParamTypeClasses, GeneralizedNewtypeDeriving,
                   FunctionalDependencies, Rank2Types, FlexibleContexts
   main-is: Test.hs
-  build-depends:  base >= 3.0, template-haskell >= 2.0, QuickCheck >= 1.2.0.0
+  build-depends:  base >= 3.0 && < 5, template-haskell >= 2.0, QuickCheck >= 1.2.0.0
 }