diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
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/VCard.hs b/Text/VCard.hs
new file mode 100644
--- /dev/null
+++ b/Text/VCard.hs
@@ -0,0 +1,29 @@
+-- Copyright (C) 2008 Mathieu Boespflug <mboes@tweag.net>
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-- 02110-1301, USA.
+
+-- | This module reexports most of the modules in the vCard library in
+-- additionto the mime-directory library, with the exception of
+-- |Text.VCard.Query|, since that library should be imported qualified, as
+-- many of the names clash with standard |Prelude| names.
+module Text.VCard
+    ( module D
+    , module Text.VCard.Types
+    , module Text.VCard.Selectors ) where
+
+import Codec.MIME.ContentType.Text.Directory as D
+import Text.VCard.Types
+import Text.VCard.Selectors
diff --git a/Text/VCard/Format/Directory.hs b/Text/VCard/Format/Directory.hs
new file mode 100644
--- /dev/null
+++ b/Text/VCard/Format/Directory.hs
@@ -0,0 +1,147 @@
+-- Copyright (C) 2008 Mathieu Boespflug <mboes@tweag.net>
+--
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+-- 02110-1301, USA.
+
+module Text.VCard.Format.Directory
+    ( module Text.VCard, readVCards, fromProperties, writeVCard ) where
+
+import Text.VCard
+import qualified Text.VCard.Query as Q
+import qualified Codec.MIME.ContentType.Text.Directory as D
+import qualified Data.Map as Map
+import qualified Data.ByteString.Lazy.Char8 as B
+import Text.Printf
+import Data.List (intercalate)
+
+
+instance D.PrintValue ExtraValue where
+    printValue (Struct xs) =
+        D.escape ",;" $ B.intercalate "," $ intercalate [";"] xs
+    printValue (Binary blob) = blob
+    printValue (PhoneNumber num) = num
+    printValue (UTCOffset sign hrs mins) =
+        B.pack $ printf "%c%02d:%02d" sign hrs mins
+    printValue (SubVCard vc) = D.escape ",;:" $ writeVCard vc
+
+showBS :: Show a => a -> B.ByteString
+showBS = B.pack . show
+
+writeVCard :: VCard -> B.ByteString
+writeVCard (VCard ver attrs) =
+    D.printDirectory' $ [begin, version] ++ concat (Map.elems attrs) ++ [end]
+    where attr typ val = D.Prop (D.nakedType typ) [] val
+          begin   = D.Prop (D.nakedType "BEGIN") [] (D.Text "VCARD")
+          end     = D.Prop (D.nakedType "END") [] (D.Text "VCARD")
+          version = D.Prop (D.nakedType "VERSION") [] $
+                    D.Text $ B.concat [ showBS $ version_major ver, "."
+                                      , showBS $ version_minor ver ]
+
+readVCards :: SourceName -> B.ByteString -> [VCard]
+readVCards file =
+    map fromProperties . D.groupByBeginEnd . D.parseDirectory' vCardValueParser
+
+parseVersion :: B.ByteString -> Version
+parseVersion s = let (majt, mint) = B.break (=='.') s
+                     maj = maybe err fst (B.readInt majt)
+                     min = maybe err fst (B.readInt (B.drop 1 mint))
+                 in Version maj min
+    where err = error "Not a valid version number."
+
+fromProperties :: [VProperty] -> VCard
+fromProperties =
+    foldr f VCard{ vcard_version = undefined, vcard_properties = Map.empty }
+    where f p vcard | p D.@@ "begin" = vcard -- administrative
+                    | p D.@@ "end" = vcard   -- junk.
+                    | p D.@@ "version" =
+                        let D.Text ver = D.prop_value p
+                        in vcard { vcard_version = parseVersion ver }
+                    | otherwise = Q.insert p vcard
+
+fields :: B.ByteString -> [B.ByteString]
+fields "" = []
+fields s = B.foldr f [B.empty] s
+    where f ';'  (xs:xss) = B.empty : xs : xss
+          f '\\' ("":xs:xss) = B.cons ';' xs : xss
+          f '\\' (xs:xss) | Just ('\\',_) <- B.uncons xs = B.cons '\\' xs : xss
+          f x (xs:xss) = B.cons x xs : xss
+
+vCardValueParser :: D.ValueParser ExtraValue
+vCardValueParser tps@(_,params)
+    | Just [valspec] <- D.lookupParameter "value" params = parserFromSpec valspec tps
+    | otherwise = defaultValueParser tps
+
+type ValueSpec = B.ByteString
+
+parserFromSpec :: ValueSpec -> D.ValueParser ExtraValue
+parserFromSpec "uri" = D.pa_URI
+parserFromSpec "text" = D.pa_text
+parserFromSpec "date" = D.pa_date
+parserFromSpec "date-time" = D.pa_dateTime
+parserFromSpec "integer" = D.pa_integer
+parserFromSpec "boolean" = D.pa_boolean
+parserFromSpec "float" = D.pa_float
+parserFromSpec "binary" = pa_binary
+parserFromSpec "phone-number" = pa_phoneNumber
+parserFromSpec "utc-offset" = pa_utcOffset
+parserFromSpec "vcard" = pa_subVCard
+
+-- | Maps property types to the corresponding default value parser, in the
+-- absence of any VALUE parameter.
+defaultValueParser :: D.ValueParser ExtraValue
+defaultValueParser tps@(typ,_)
+    | typ == D.nakedType "photo" = pa_binary tps
+    | typ == D.nakedType "bday" = D.pa_date tps
+    | typ == D.nakedType "adr" = pa_struct tps
+    | typ == D.nakedType "tel" = pa_phoneNumber tps
+    | typ == D.nakedType "tz" = pa_utcOffset tps
+    | typ == D.nakedType "geo" = pa_struct tps
+    | typ == D.nakedType "logo" = pa_binary tps
+    | typ == D.nakedType "agent" = pa_subVCard tps
+    | typ == D.nakedType "org" = pa_struct tps
+    | typ == D.nakedType "rev" = D.pa_dateTime tps
+    | typ == D.nakedType "sound" = pa_binary tps
+    | typ == D.nakedType "url" = D.pa_URI tps
+    | typ == D.nakedType "key" = pa_binary tps
+    | otherwise = D.pa_text tps
+
+-- Parsers for vCard specific value specifications.
+
+-- | A variant of RFC 2425 text type where all ';' characters are escaped
+-- except those that serve as field delimiters.
+pa_struct :: D.ValueParser ExtraValue
+pa_struct tps =
+    return . D.IANAValue . Struct . map (map untxt . D.pa_text tps) . fields
+    where untxt (D.Text s) = s
+
+pa_binary :: D.ValueParser ExtraValue
+pa_binary _ = return . D.IANAValue . Binary
+
+pa_phoneNumber :: D.ValueParser ExtraValue
+pa_phoneNumber tps s =
+    case D.pa_text tps s of [D.Text txt] -> return $ D.IANAValue $ PhoneNumber txt
+                            _ -> error "Expecting single value."
+
+pa_utcOffset :: D.ValueParser ExtraValue
+pa_utcOffset _ s | [sign,h1,h2,':',m1,m2] <- B.unpack s =
+   let hrs = read (h1:h2:[])
+       mins = read (m1:m2:[])
+   in return $ D.IANAValue $ UTCOffset sign hrs mins
+
+pa_subVCard :: D.ValueParser ExtraValue
+pa_subVCard tps =
+    return . D.IANAValue . SubVCard . head . readVCards "<>" . text
+    where text s = case D.pa_text tps s of [D.Text txt] -> txt
+                                           _ -> error "Expecting single value."
diff --git a/vcard.cabal b/vcard.cabal
new file mode 100644
--- /dev/null
+++ b/vcard.cabal
@@ -0,0 +1,23 @@
+name:           vcard
+version:        0.1
+author:         Mathieu Boespflug
+maintainer:     Mathieu Boespflug <mboes@tweag.net>
+homepage:       http://code.haskell.org/~mboes/vcard.git
+synopsis:       A library for parsing/printing vCards from/to various formats.
+description:
+        A library for parsing\/printing vCards from\/to various formats.
+        Currently only vCard 3.0 defined in RFC 2426 is supported.
+category:       Text
+license:        LGPL
+license-file:   LICENSE
+copyright:      (c) 2008. Mathieu Boespflug <mboes@tweag.net>
+cabal-version:  >= 1.2.0
+build-type:     Simple
+tested-with:    GHC ==6.10
+
+library
+    extensions:      OverloadedStrings, PatternGuards
+    build-depends:   base >= 3, containers, bytestring >= 0.9,
+                     mime-directory >= 0.1
+    exposed-modules: Text.VCard
+                     Text.VCard.Format.Directory