diff --git a/Setup.lhs b/Setup.lhs
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,17 +1,3 @@
-#!/usr/bin/runhaskell
-> module Main where
+#!/usr/bin/env runhaskell
 > import Distribution.Simple
-> import Distribution.Simple.Setup
-> import Distribution.PackageDescription
-> import Distribution.Simple.LocalBuildInfo
-> import System.Cmd(system)
-> import Distribution.Simple.LocalBuildInfo
-> import Test.Hspec
-> import Specs (specs)
->
-> main :: IO ()
-> main = defaultMainWithHooks hooks
->   where hooks = simpleUserHooks { preSDist = \ _ _     -> runspecs >> return emptyHookedBuildInfo }
->
-> runspecs :: IO ()
-> runspecs = specs >>= hspecX
+> main = defaultMain
diff --git a/hspec.cabal b/hspec.cabal
--- a/hspec.cabal
+++ b/hspec.cabal
@@ -1,7 +1,7 @@
 name:           hspec
-version:        0.9.1.1
+version:        0.9.2
 cabal-version:  >= 1.8
-build-type:     Custom
+build-type:     Simple
 license:        BSD3
 license-file:   LICENSE
 copyright:      (c) 2011 Trystan Spangler
@@ -17,16 +17,10 @@
              .
              Hspec is roughly based on the Ruby library RSpec. However, Hspec is just a framework for running HUnit and QuickCheck tests. Compared to other options, it provides a much nicer syntax that makes tests very easy to read.
 
-extra-source-files: ./Specs.hs ./Test/Hspec/HUnit.hs
-                    ./Test/Hspec/Runner.hs ./Test/Hspec/Monadic.hs
-                    ./Test/Hspec/Formatters.hs
-                    ./Test/Hspec/Core.hs ./Test/Hspec/QuickCheck.hs
-
 Library
   exposed:        True
   buildable:      True
   extensions:     FlexibleInstances
-  other-modules:  Specs
   ghc-options:    -Wall -fno-warn-hi-shadowing
 
   build-depends: HUnit >=1 && <=2,
@@ -40,3 +34,15 @@
                    Test.Hspec.Runner Test.Hspec.Monadic
                    Test.Hspec.Formatters Test.Hspec.QuickCheck
 
+test-suite spec
+  type:           exitcode-stdio-1.0
+  main-is:        runtests.hs
+  other-modules:  Specs
+  ghc-options:    -Wall -fno-warn-hi-shadowing
+
+  build-depends: HUnit >=1 && <=2,
+                 QuickCheck >=2.4.0.1 && <=2.5,
+                 base >=4 && <=5,
+                 silently >= 1.1.1 && < 2,
+                 ansi-terminal == 0.5.5,
+                 transformers >= 0.2.0 && < 0.3.0
diff --git a/runtests.hs b/runtests.hs
new file mode 100644
--- /dev/null
+++ b/runtests.hs
@@ -0,0 +1,5 @@
+import Test.Hspec
+import Specs (specs)
+
+main :: IO ()
+main = specs >>= hspecX