diff --git a/Data/Text/Buildable.hs b/Data/Text/Buildable.hs
--- a/Data/Text/Buildable.hs
+++ b/Data/Text/Buildable.hs
@@ -5,7 +5,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Format.hs b/Data/Text/Format.hs
--- a/Data/Text/Format.hs
+++ b/Data/Text/Format.hs
@@ -5,7 +5,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Format/Functions.hs b/Data/Text/Format/Functions.hs
--- a/Data/Text/Format/Functions.hs
+++ b/Data/Text/Format/Functions.hs
@@ -5,7 +5,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Format/Int.hs b/Data/Text/Format/Int.hs
--- a/Data/Text/Format/Int.hs
+++ b/Data/Text/Format/Int.hs
@@ -3,7 +3,7 @@
 -- Module:      Data.Text.Format.Int
 -- Copyright:   (c) 2011 MailRank, Inc.
 -- License:     BSD3
--- Maintainer:  Bryan O'Sullivan <bos@mailrank.com>
+-- Maintainer:  Bryan O'Sullivan <bos@serpentine.com>
 -- Stability:   experimental
 -- Portability: portable
 --
diff --git a/Data/Text/Format/Params.hs b/Data/Text/Format/Params.hs
--- a/Data/Text/Format/Params.hs
+++ b/Data/Text/Format/Params.hs
@@ -3,7 +3,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Format/Types.hs b/Data/Text/Format/Types.hs
--- a/Data/Text/Format/Types.hs
+++ b/Data/Text/Format/Types.hs
@@ -5,7 +5,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Format/Types/Internal.hs b/Data/Text/Format/Types/Internal.hs
--- a/Data/Text/Format/Types/Internal.hs
+++ b/Data/Text/Format/Types/Internal.hs
@@ -5,7 +5,7 @@
 -- Copyright   : (c) 2011 MailRank, Inc.
 --
 -- License     : BSD-style
--- Maintainer  : bos@mailrank.com
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/README.markdown b/README.markdown
--- a/README.markdown
+++ b/README.markdown
@@ -9,11 +9,11 @@
 and other improvements.
 
 Please report bugs via the
-[github issue tracker](https://github.com/mailrank/text-format/issues).
+[github issue tracker](https://github.com/bos/text-format/issues).
 
-Master [git repository](https://github.com/mailrank/text-format):
+Master [git repository](https://github.com/bos/text-format):
 
-* `git clone git://github.com/mailrank/text-format.git`
+* `git clone git://github.com/bos/text-format.git`
 
 There's also a [Mercurial mirror](https://bitbucket.org/bos/text-format):
 
@@ -25,4 +25,4 @@
 -------
 
 This library is written and maintained by Bryan O'Sullivan,
-<bos@mailrank.com>.
+<bos@serpentine.com>.
diff --git a/text-format.cabal b/text-format.cabal
--- a/text-format.cabal
+++ b/text-format.cabal
@@ -1,12 +1,12 @@
 name:           text-format
-version:        0.3.0.5
+version:        0.3.0.6
 license:        BSD3
 license-file:   LICENSE
-homepage:       https://github.com/mailrank/text-format
-bug-reports:    https://github.com/mailrank/text-format/issues
+homepage:       https://github.com/bos/text-format
+bug-reports:    https://github.com/bos/text-format/issues
 category:       Text
-author:         Bryan O'Sullivan <bos@mailrank.com>
-maintainer:     Bryan O'Sullivan <bos@mailrank.com>
+author:         Bryan O'Sullivan <bos@serpentine.com>
+maintainer:     Bryan O'Sullivan <bos@serpentine.com>
 stability:      experimental
 tested-with:    GHC == 7.0.3
 synopsis:       Text formatting
@@ -64,7 +64,7 @@
 
 source-repository head
   type:     git
-  location: https://github.com/mailrank/text-format
+  location: https://github.com/bos/text-format
 
 source-repository head
   type:     mercurial
