diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2009 George Pollard
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the author nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/Setup.lhs b/Setup.lhs
new file mode 100644
--- /dev/null
+++ b/Setup.lhs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+> import Distribution.Simple
+> main = defaultMain
diff --git a/Text/Email/Validate.hs b/Text/Email/Validate.hs
new file mode 100644
--- /dev/null
+++ b/Text/Email/Validate.hs
@@ -0,0 +1,97 @@
+{- |
+
+Properly validating e-mail addresses (or converting EBNF to Parsec)
+
+In recent times there have been several calls for websites to properly validate
+email addresses. Invariably, the compiled regex from Perl’s RFC822 is pasted up
+as The Way To Do It. The problem with this is (as the source code from the Perl
+module notes) is that email addresses cannot be validated by a simple regex
+(due to requiring parenthesis-matching). The Perl code addresses this by first
+stripping out all comments and then parsing via regex.
+
+With this in mind, I thought that implementing the Addr-Spec specification from
+RFC 5322 (only released less than 6 months ago) might be a good test of the
+Haskell library Parsec. So, without further ado I went ahead and translated the
+EBNF from RFC 5322 directly into Parsec.
+
+Author: Porges
+Source: <http://porg.es/blog/properly-validating-e-mail-addresses>
+
+-}
+
+module Text.Email.Validate ( isValid ) where
+
+import Text.Parsec
+import Text.Parsec.Char
+import Data.Char (chr)
+
+-- | Validate an email address encoded in a String satisifes RFC 5322
+isValid :: String -> Bool
+isValid x = let result = valid x in
+        either (const False) (const True) result
+
+valid :: String -> Either ParseError ()
+valid x = parse addrSpec "" x
+
+ignore x = x >> return ()
+
+addrSpec = localPart >> char '@' >> domain >> eof
+
+localPart = dotAtom <|> quotedString <|> obsLocalPart <?> "local part"
+domain = dotAtom <|> domainLiteral <|> obsDomain <?> "domain"
+
+domainLiteral = optional cfws >> char '[' >>
+                many ( optional fws >> dtext) >>
+                optional fws  >> char ']' >> optional cfws
+                <?> "domain literal"
+
+ranges = oneOf . map chr . concat
+vchar = ranges [[0x21..0x7E]] -- from Backus-Naur RFC
+dtext = ranges [[33..90],[94..126]] <|> obsDtext
+qtext = ranges [[33],[35..91],[93..126]] <|> obsQtext
+atext = alphaNum <|> oneOf "!#$%&'*+-/=?^_`{|}~"
+ctext = ranges [[33..39],[42..91],[93..126]] <|> obsCtext
+wsp = char ' '
+        <|> char '\t'
+        <?> "space or tab"
+
+cr = char '\r' <?> "carriage return"
+lf = char '\n' <?> "line feed"
+crlf = cr >> lf <?> "CRLF line ending"
+
+-- # modification: added try
+cfws = try (many1 (optional fws >> comment) >> optional fws) <|> ignore fws
+-- # modification from RFC: adding try because of overlap
+fws = try (optional (many wsp >> crlf) >> many1 wsp)
+        <|> many1 wsp
+        <|> obsFws
+
+-- # modification: added try
+comment = between (char '(') (char ')') (many (try (optional fws >> ccontent)) >> optional fws)
+        <?> "comment"
+ccontent = ignore ctext
+        <|> ignore quotedPair
+        <|> comment
+
+atom = optional cfws >> many1 atext >> optional cfws
+dotAtomText = many1 atext >> many (char '.' >> many1 atext)
+dotAtom = optional cfws >> dotAtomText >> optional cfws
+
+-- # other change from RFC -- merge prefix
+quotedPair = char '\\' >> ((vchar <|> wsp) <|> obsQp)
+qcontent = qtext <|> quotedPair
+quotedString = optional cfws >> char '\"' >> many (optional fws >> qcontent) >>
+        optional fws >> char '\"' >> optional cfws
+        <?> "quoted string"
+
+-- # Obsolete syntax
+obsNoWsCtl = ranges [[1..8],[11..12],[14..31],[127]]
+obsCtext = obsNoWsCtl
+obsDtext = obsNoWsCtl <|> quotedPair
+obsQtext = obsNoWsCtl
+-- # change: see above
+obsQp = (char (chr 0) <|> obsNoWsCtl <|> lf <|> cr)
+obsLocalPart = word >> many (char '.' >> word) >> return ()
+obsDomain = atom >> many (char '.' >> atom) >> return ()
+obsFws = many1 wsp >> many (crlf >> many1 wsp) >> return []
+word = atom <|> quotedString
diff --git a/email-validate.cabal b/email-validate.cabal
new file mode 100644
--- /dev/null
+++ b/email-validate.cabal
@@ -0,0 +1,19 @@
+name:           email-validate
+version:        0.1
+license:        BSD3
+license-file:   LICENSE
+author:         George Pollard
+maintainer:     Don Stewart <dons@galois.com>
+homepage:       http://porg.es/blog/properly-validating-e-mail-addresses
+category:       Text
+synopsis:       Validating an email address string against RFC 5322
+description:    Validating an email address string against RFC 5322
+build-type:     Simple
+stability:      experimental
+cabal-version:  >= 1.2
+
+library
+    build-depends:  base, parsec >= 3.0
+
+    exposed-modules:
+            Text.Email.Validate