diff --git a/mkcabal.cabal b/mkcabal.cabal
--- a/mkcabal.cabal
+++ b/mkcabal.cabal
@@ -1,5 +1,5 @@
 Name:                mkcabal
-Version:             0.4.1
+Version:             0.4.1.1
 License:             GPL
 License-file:        LICENSE
 Homepage:            http://code.haskell.org/~dons/code/mkcabal
@@ -11,13 +11,14 @@
 Synopsis:            Generate cabal files for a Haskell project
 extra-source-files:  Licenses.hs
 cabal-version:       >= 1.2
+build-type:          Simple
 
 flag small_base
   description: Choose the new smaller, split-up base package.
  
 Executable mkcabal
     main-is:             mkcabal.hs
-    build-depends:       mtl, pcre-light ==0.3, readline
+    build-depends:       mtl, pcre-light>=0.3, readline
     if flag(small_base)
         build-depends: base >= 3,
                        pretty, old-locale, old-time, directory
diff --git a/mkcabal.hs b/mkcabal.hs
--- a/mkcabal.hs
+++ b/mkcabal.hs
@@ -393,7 +393,7 @@
     defName         = "Author Name"
     defMail         = "user@email.address"
     defNameAndMail  = [defName,defMail]
-    nameAndMail s   = pair . fromMaybe defNameAndMail $
-                        match (compile "(.*)[[:space:]]*<(.*)>" []) s []
+    nameAndMail s   = pair . maybe defNameAndMail tail $
+                        match (compile "(.*?)[[:space:]]*<(.*)>" []) s []
     pair [x,y]      = (x,y)