diff --git a/Data/Text.hs b/Data/Text.hs
index 1d03413836f907dfd9b3893505443140f16d6dd7..a4cc12805e242f3fb164d501320606ff222fa146 100644
--- a/Data/Text.hs
+++ b/Data/Text.hs
@@ -8,7 +8,7 @@
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Array.hs b/Data/Text/Array.hs
index 2a26879788722827141211dc898de18e1cbe28e2..436a22cc4e9c91b147ee0c5c6099adaca7311684 100644
--- a/Data/Text/Array.hs
+++ b/Data/Text/Array.hs
@@ -6,7 +6,8 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
+-- duncan@haskell.org
-- Stability : experimental
-- Portability : portable
--
diff --git a/Data/Text/Encoding.hs b/Data/Text/Encoding.hs
index 2b9b437e6aaea9494d49547d447d0bb4e9a1e998..67a00b1635999d4ead654efb68eb0af82bba0b08 100644
--- a/Data/Text/Encoding.hs
+++ b/Data/Text/Encoding.hs
@@ -5,7 +5,7 @@
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : portable
diff --git a/Data/Text/Foreign.hs b/Data/Text/Foreign.hs
index 11d92e48354b6810e1e5b8284be58a064658da4a..94f8deb9a66f1d93ab8a0e95f4214e19b529520f 100644
--- a/Data/Text/Foreign.hs
+++ b/Data/Text/Foreign.hs
@@ -4,7 +4,7 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Fusion.hs b/Data/Text/Fusion.hs
index d7e6752122a4bb5c38a9946a9bc50bec692c7781..fb1c2263984c40c53140a7db1a0619c6a3b84363 100644
--- a/Data/Text/Fusion.hs
+++ b/Data/Text/Fusion.hs
@@ -7,7 +7,7 @@
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Fusion/Common.hs b/Data/Text/Fusion/Common.hs
index c7ab34c4c328a173cb81a01f7a02d0adba326a43..551a58629e96fb43ba43242a8ebef4d501cebdca 100644
--- a/Data/Text/Fusion/Common.hs
+++ b/Data/Text/Fusion/Common.hs
@@ -4,7 +4,7 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Fusion/Internal.hs b/Data/Text/Fusion/Internal.hs
index 43f74d3b892e8561fcb521f425326131338de41c..b9a0a09943f2aec90ac420d5bc64fdf43eaa5cd1 100644
--- a/Data/Text/Fusion/Internal.hs
+++ b/Data/Text/Fusion/Internal.hs
@@ -6,7 +6,7 @@
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Internal.hs b/Data/Text/Internal.hs
index 896fc575eca44cc740144357f923c8505908fc95..ef3744bc623c93bab3ec80e68f4e035410308afc 100644
--- a/Data/Text/Internal.hs
+++ b/Data/Text/Internal.hs
@@ -1,13 +1,13 @@
{-# LANGUAGE DeriveDataTypeable #-}
-- |
--- Module : Data.Text
+-- Module : Data.Text.Internal
-- Copyright : (c) Tom Harper 2008-2009,
-- (c) Bryan O'Sullivan 2009,
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Lazy.hs b/Data/Text/Lazy.hs
index 1ad6f79b0ea3b9fd2dab98c63c0330e814ea6ee5..c7adb30e4f7b259f20df3d61a3406333f3cffa86 100644
--- a/Data/Text/Lazy.hs
+++ b/Data/Text/Lazy.hs
@@ -1,12 +1,10 @@
{-# OPTIONS_GHC -fno-warn-orphans #-}
-- |
-- Module : Data.Text.Lazy
--- Copyright : (c) Bryan O'Sullivan 2009,
--- (c) Tom Harper 2008-2009,
--- (c) Duncan Coutts 2008
+-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Lazy/Encoding.hs b/Data/Text/Lazy/Encoding.hs
index 7202334c8e3ff73f8d3b566870cabb61be065dc6..f22f36084fae06358482601c5d44ba154006ffe7 100644
--- a/Data/Text/Lazy/Encoding.hs
+++ b/Data/Text/Lazy/Encoding.hs
@@ -1,11 +1,9 @@
-- |
-- Module : Data.Text.Lazy.Encoding
--- Copyright : (c) Tom Harper 2008-2009,
--- (c) Bryan O'Sullivan 2009,
--- (c) Duncan Coutts 2009
+-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : portable
diff --git a/Data/Text/Lazy/Encoding/Fusion.hs b/Data/Text/Lazy/Encoding/Fusion.hs
index 01efe36065a3940688597a4bfc551e161c3d496f..ce88c742ee9269291e7e853443cc0e1648aa9879 100644
--- a/Data/Text/Lazy/Encoding/Fusion.hs
+++ b/Data/Text/Lazy/Encoding/Fusion.hs
@@ -5,7 +5,7 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : portable
diff --git a/Data/Text/Lazy/Fusion.hs b/Data/Text/Lazy/Fusion.hs
index 4bc8587e90c1a0b6ce775358981310d7faaa115f..a19470095aea6dc9bed9927c85af545798fe8fd4 100644
--- a/Data/Text/Lazy/Fusion.hs
+++ b/Data/Text/Lazy/Fusion.hs
@@ -3,7 +3,7 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/Data/Text/Lazy/Internal.hs b/Data/Text/Lazy/Internal.hs
index cb0f19d23babcc20ea735a11a789bc4a6fe00198..9a254111ae43f52642b8db088e37bea13a244730 100644
--- a/Data/Text/Lazy/Internal.hs
+++ b/Data/Text/Lazy/Internal.hs
@@ -4,7 +4,8 @@
-- Copyright : (c) Bryan O'Sullivan 2009
--
-- License : BSD-style
--- Maintainer : bos@serpentine.com
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
+-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
--
diff --git a/Data/Text/Unsafe.hs b/Data/Text/Unsafe.hs
index 2243f3b4a74c5b3b7915d6e0a4189916843c601a..4e1d12024b242008bfb2d9392c5c57ba994b027d 100644
--- a/Data/Text/Unsafe.hs
+++ b/Data/Text/Unsafe.hs
@@ -2,7 +2,8 @@
-- Module : Data.Text.Unsafe
-- Copyright : (c) Bryan O'Sullivan 2009
-- License : BSD-style
--- Maintainer : bos@serpentine.com
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
+-- duncan@haskell.org
-- Stability : experimental
-- Portability : portable
--
diff --git a/Data/Text/UnsafeChar.hs b/Data/Text/UnsafeChar.hs
index c4af1e99f8a7f8b9404c1deefe8960c0a281a12b..79949eda97f4bafdc1b440da1e76977f6532ec3b 100644
--- a/Data/Text/UnsafeChar.hs
+++ b/Data/Text/UnsafeChar.hs
@@ -7,7 +7,7 @@
-- (c) Duncan Coutts 2009
--
-- License : BSD-style
--- Maintainer : rtharper@aftereternity.co.uk, bos@serpentine.com,
+-- Maintainer : bos@serpentine.com, rtharper@aftereternity.co.uk,
-- duncan@haskell.org
-- Stability : experimental
-- Portability : GHC
diff --git a/text.cabal b/text.cabal
index be977eafcdc5ba2b8ee9a53aaf06cfb9f136f4c8..b10f1340dc9338fde4ab881b9ee86a00151d5cea 100644
--- a/text.cabal
+++ b/text.cabal
@@ -8,7 +8,7 @@ author: Tom Harper <rtharper@aftereternity.co.uk>
maintainer: Bryan O'Sullivan <bos@serpentine.com>
Tom Harper <rtharper@aftereternity.co.uk>
Duncan Coutts <duncan@haskell.org>
-copyright: 2008-2009 Tom Harper
+copyright: 2008-2009 Tom Harper, 2009 Bryan O'Sullivan
category: Data, Text
build-type: Simple
cabal-version: >= 1.2