diff --git a/Postmaster/Base.hs b/Postmaster/Base.hs
--- a/Postmaster/Base.hs
+++ b/Postmaster/Base.hs
@@ -15,7 +15,6 @@
   )
   where
 
-import Prelude hiding ( catch )
 import Foreign
 import Network.Socket hiding ( listen, shutdown )
 import Control.Exception
@@ -155,7 +154,7 @@
 fallback f g = do
   cfg <- ask
   st <- get
-  (r, st', w) <- liftIO $ catch
+  (r, st', w) <- liftIO $ Control.Exception.catch
       (runRWST f cfg st)
       (\e -> runRWST (yell (CaughtException e) >> g) cfg st)
   tell w
diff --git a/Postmaster/Main.hs b/Postmaster/Main.hs
--- a/Postmaster/Main.hs
+++ b/Postmaster/Main.hs
@@ -58,14 +58,14 @@
 smtpd buf@(Buf _  _  0) = return ([], buf)
 smtpd buf@(Buf _ ptr n) = do
   sst <- getSessionState
-  if (sst == HaveData)
+  if sst == HaveData
       then do (r, buf') <- feed buf
               return (maybeToList r, buf')
       else do xs <- liftIO (peekArray (fromIntegral n) ptr)
               let xs'  = map (toEnum . fromEnum) xs
                   ls'  = splitList "\r\n" xs'
                   ls   = reverse . tail $ reverse ls'
-                  rest = head $ reverse ls'
+                  rest = last ls'
                   i    = length xs - length rest
               rs <- mapM handleDialog ls
               buf' <- liftIO $ flush (fromIntegral i) buf
diff --git a/postmaster.cabal b/postmaster.cabal
--- a/postmaster.cabal
+++ b/postmaster.cabal
@@ -1,11 +1,12 @@
 Name:                   postmaster
-Version:                0.2
-Copyright:              (c) 2004-2010 Peter Simons
+Version:                0.3
+Copyright:              Peter Simons
 License:                GPL
 License-File:           COPYING
 Author:                 Peter Simons <simons@cryp.to>
 Maintainer:             Peter Simons <simons@cryp.to>
-Homepage:               http://gitorious.org/postmaster
+Homepage:               http://github.com/peti/postmaster
+Bug-Reports:            http://github.com/peti/postmaster/issues
 Category:               Network
 Synopsis:               Postmaster ESMTP Server
 Description:            Postmaster implements an ESMTP server. Given a configuration,
@@ -17,7 +18,7 @@
                         call-back functions.
 Cabal-Version:          >= 1.6
 Build-Type:             Simple
-Tested-With:            GHC == 6.12.1
+Tested-With:            GHC >= 6.12.3 && <= 7.6.2
 
 Extra-Source-Files:     Postmaster/Base.hs
                         Postmaster/FSM/HeloName.hs
@@ -40,12 +41,12 @@
 
 Source-Repository head
   Type:                 git
-  Location:             git://gitorious.org/postmaster/mainline.git
+  Location:             git://github.com/peti/postmaster.git
 
 Executable postmaster
   Main-Is:              tutorial.lhs
   GHC-Options:          -Wall -threaded
   Extra-Libraries:      adns crypto
-  Build-Depends:        base >=3 && <5, haskell98, directory, mtl, network, unix, parsec,
+  Build-Depends:        base >=3 && <5, directory, mtl, network, unix, parsec,
                         containers, bytestring, old-time, hsyslog, hsdns, hsemail,
                         hopenssl