diff --git a/COPYING b/COPYING
new file mode 100644
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,25 @@
+Copyright (c) 2009-2012 Conal Elliott
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The names of the authors may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/TypeCompose.cabal b/TypeCompose.cabal
--- a/TypeCompose.cabal
+++ b/TypeCompose.cabal
@@ -1,37 +1,41 @@
 Name:                TypeCompose
-Version:             0.9.5
+Version:             0.9.6
 Synopsis: 	     Type composition classes & instances
 Category:            Composition, Control
+Cabal-Version:       >= 1.6
 Description:
   TypeCompose provides some classes & instances for forms of type
   composition, as well as some modules who haven't yet found a home.
   .
   Please see the project wiki page: <http://haskell.org/haskellwiki/TypeCompose>
   .
-  &#169; 2007-2012 by Conal Elliott; BSD3 license.
+  Copyright 2007-2012 by Conal Elliott; BSD3 license.
 Author:              Conal Elliott 
 Maintainer:          conal@conal.net
-Homepage:            http://haskell.org/haskellwiki/TypeCompose
-Package-Url:	     http://code.haskell.org/~conal/code/TypeCompose
 Copyright:           (c) 2007-2012 by Conal Elliott
 License:             BSD3
+License-File:        COPYING
 Stability:           provisional
 build-type:	     Simple
-Hs-Source-Dirs:      src
-Extensions:          
-Build-Depends:       base<5
-Exposed-Modules:     
-                     Data.Bijection
-                     Data.CxMonoid
-                     Data.RefMonad
-                     Data.Pair
-                     Data.Zip
-                     Data.Lambda
-                     Data.Title
-		     Data.Partial
-                     Control.Instances
-                     Control.Compose
-Extra-Source-Files:
-ghc-options:         -Wall
 
--- TODO: eliminate Pair or Zip
+source-repository head
+  type:     git
+  location: git://github.com/conal/TypeCompose.git
+
+Library
+  Hs-Source-Dirs:      src
+  Build-Depends:       base<5
+  Exposed-Modules:     
+                       Data.Bijection
+                       Data.CxMonoid
+                       Data.RefMonad
+                       Data.Pair
+                       Data.Zip
+                       Data.Lambda
+                       Data.Title
+                       Data.Partial
+                       Control.Instances
+                       Control.Compose
+  ghc-options:         -Wall
+
+  -- TODO: eliminate Pair or Zip