diff --git a/BSD3.txt b/BSD3.txt
new file mode 100644
--- /dev/null
+++ b/BSD3.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2010, Oscar Finnsson
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Oscar Finnsson nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 Oscar Finnsson 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/src/Test/Framework/TH.hs b/src/Test/Framework/TH.hs
--- a/src/Test/Framework/TH.hs
+++ b/src/Test/Framework/TH.hs
@@ -10,7 +10,7 @@
 --
 -- 
 -----------------------------------------------------------------------------
-{-# OPTIONS_GHC -fglasgow-exts -XTemplateHaskell #-}
+{-# OPTIONS_GHC -XTemplateHaskell #-}
 
 module Test.Framework.TH (
   defaultMainGenerator,
diff --git a/test-framework-th.cabal b/test-framework-th.cabal
--- a/test-framework-th.cabal
+++ b/test-framework-th.cabal
@@ -1,14 +1,11 @@
 name: test-framework-th
-version: 0.1.3
-cabal-version: -any
+version: 0.2.0
+cabal-version: >= 1.6
 build-type: Simple
 license: BSD3
+license-file: BSD3.txt
 maintainer: Oscar Finnsson
-build-depends: base >= 4 && < 5, test-framework, language-haskell-extract, haskell-src-exts, haskell98, regex-posix, template-haskell
-stability:
 homepage: http://github.com/finnsson/test-generator
-package-url:
-bug-reports:
 synopsis: Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell.
 description:
    @test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
@@ -16,7 +13,7 @@
    @defaultMainGenerator@ will extract all functions beginning with case_ or prop_ in the module and put them in a testGroup.
    .
    > -- file SomeModule.hs
-   > ( -# OPTIONS_GHC -fglasgow-exts -XTemplateHaskell #- )
+   > { -# OPTIONS_GHC -fglasgow-exts -XTemplateHaskell #- }
    > module SomeModule where
    > import Test.Framework.TH
    > import Test.Framework
@@ -57,32 +54,13 @@
    (e.g. if you want to be able to call the testgroup from another module).
 category: Testing
 author: Oscar Finnsson & Emil Nordling
-tested-with:
-data-files:
-data-dir: ""
-extra-source-files:
-extra-tmp-files:
-exposed-modules: Test.Framework.TH 
-exposed: True
-buildable: True
-build-tools:
-cpp-options:
-cc-options:
-ld-options:
-pkgconfig-depends:
-frameworks:
-c-sources:
-extensions:
-extra-libraries:
-extra-lib-dirs:
-includes:
-install-includes:
-include-dirs:
-hs-source-dirs: src
-other-modules:
-ghc-prof-options:
-ghc-shared-options:
-ghc-options:
-hugs-options:
-nhc98-options:
-jhc-options:
+
+library
+  exposed-modules: Test.Framework.TH 
+  build-depends: base >= 4 && < 5, test-framework, language-haskell-extract >= 0.2, haskell-src-exts, haskell98, regex-posix, template-haskell
+  hs-source-dirs: src
+
+
+source-repository head
+  type:     git
+  location: https://github.com/finnsson/test-framework-th/