diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Distribution.Simple (defaultMain)
+
+main :: IO ()
+main = defaultMain
diff --git a/Setup.lhs b/Setup.lhs
deleted file mode 100644
--- a/Setup.lhs
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env runhaskell
-
-> module Main (main) where
->
-> import Distribution.Simple (defaultMain)
->
-> main :: IO ()
-> main = defaultMain
diff --git a/threadmanager.cabal b/threadmanager.cabal
--- a/threadmanager.cabal
+++ b/threadmanager.cabal
@@ -1,34 +1,45 @@
-name:    threadmanager
-version: 0.1.5
-
-category: Concurrency
-
-synopsis: Simple thread management
-
-description:
-    A simple thread management API inspired by the one in chapter 24 of /Real World Haskell/.
-    .
-    See <http://book.realworldhaskell.org/read/concurrent-and-multicore-programming.html>.
+name:         threadmanager
+version:      0.1.6
+category:     Concurrency
 
-author:     _Real World Haskell_, http://www.realworldhaskell.org/
-maintainer: Brian Lewis <brian@lorf.org>, Ian Taylor <ian@lorf.org>
+author:       _Real World Haskell_, http://www.realworldhaskell.org/
+maintainer:   Brian Lewis <brian@lorf.org>
 
 license:      BSD3
 license-file: LICENSE
 
-homepage: http://github.com/bsl/threadmanager
+synopsis:     (deprecated in favor of 'threads') Simple thread management
+description:
+  This package is useful, but deprecated. In new code, please use /threads/
+  instead. See <http://hackage.haskell.org/package/threads>.
+  .
+  A simple thread management API inspired by the one in chapter 24 of
+  /Real World Haskell/. See <http://book.realworldhaskell.org/read/concurrent-and-multicore-programming.html>.
 
-cabal-version: >= 1.6
+cabal-version: >= 1.10
 build-type:    Simple
 
+--------------------------------------------------------------------------------
+
 library
-    hs-source-dirs:  src
-    exposed-modules: Control.Concurrent.ThreadManager
-    build-depends:   base >= 3 && < 5, containers
-    ghc-options:     -Wall
-    if impl(ghc >= 6.8)
-        ghc-options: -fwarn-tabs
+  default-language: Haskell2010
 
+  ghc-options: -Wall -O2
+  if impl(ghc >= 6.8)
+    ghc-options: -fwarn-tabs
+
+  exposed-modules:
+    Control.Concurrent.ThreadManager
+
+  hs-source-dirs:
+    src
+
+  build-depends:
+    base       == 4.*,
+    containers == 0.*
+
+--------------------------------------------------------------------------------
+
 source-repository head
-    type:     git
-    location: git://github.com/bsl/threadmanager.git
+  type:     git
+  location: git://github.com/bsl/threadmanager.git