diff --git a/Network/SMTP/Client.hs b/Network/SMTP/Client.hs
--- a/Network/SMTP/Client.hs
+++ b/Network/SMTP/Client.hs
@@ -15,7 +15,8 @@
         SmtpCode(..),
         SuccessCode(..),
         Category(..),
-        Message(..),
+        Message,
+        GenericMessage(..),
         Field(..),
         NameAddr(..)
     ) where
@@ -30,6 +31,7 @@
     )
 import Text.ParserCombinators.Parsec.Rfc2822 (
         Message(..),
+        GenericMessage(Message),
         Field(..),
         NameAddr(..)
     )
diff --git a/Network/SMTP/ClientSession.hs b/Network/SMTP/ClientSession.hs
--- a/Network/SMTP/ClientSession.hs
+++ b/Network/SMTP/ClientSession.hs
@@ -11,7 +11,8 @@
         SmtpCode(..),
         SuccessCode(..),
         Category(..),
-        Message(..),
+        Message,
+        GenericMessage(..),
         Field(..),
         NameAddr(..)
         {-, suite-}
@@ -26,6 +27,7 @@
     )
 import Text.ParserCombinators.Parsec.Rfc2822 (
         Message(..),
+        GenericMessage(..),
         Field(..),
         NameAddr(..)
     )
diff --git a/SMTPClient.cabal b/SMTPClient.cabal
--- a/SMTPClient.cabal
+++ b/SMTPClient.cabal
@@ -1,25 +1,25 @@
 name: SMTPClient
-version: 1.0.1
+version: 1.0.2
 license: BSD3
 license-file: LICENSE
-cabal-version: >= 1.2
+cabal-version: >= 1.6
 copyright: (c) Stephen Blackheath
 author: Stephen Blackheath
 maintainer: http://blacksapphire.com/antispam/
 stability: stable
-synopsis: A simple SMTP client
+synopsis: A simple SMTP client library
 description:
-    A simple SMTP client for applications that want to send emails.
-    .
-    DARCS repository:
-    <http://blacksapphire.com/SMTPClient/>
+    A simple SMTP client library for applications that want to send emails.
 extra-source-files:
     example.hs
     LICENSE
 category: Network
 build-type: Simple
+source-repository head
+    type:     darcs
+    location: http://code.haskell.org/SMTPClient/
 Library
     exposed-modules: Network.SMTP.Client, Network.SMTP.ClientSession
-    build-depends: base, hsemail, network, old-time, old-locale, containers,
-                   extensible-exceptions >= 0.1 && < 0.2
+    build-depends: base >= 3 && < 5, hsemail >= 1.6 && < 1.7, network, old-time, old-locale,
+                   containers, extensible-exceptions >= 0.1 && < 0.2