diff --git a/Data/Text.hs b/Data/Text.hs
index b9592e7e4ec18db8beb086b3dcc374c3ea2cb607..dd53d8870858089516ade7bfee937fc79d47cb8d 100644
--- a/Data/Text.hs
+++ b/Data/Text.hs
@@ -11,8 +11,7 @@
 --               (c) 2008, 2009 Tom Harper
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Array.hs b/Data/Text/Array.hs
index ca614eef39ad40615497a075370f4861e058ab71..875b40fb0da28ebcdd24552fd6b52785f792172e 100644
--- a/Data/Text/Array.hs
+++ b/Data/Text/Array.hs
@@ -6,8 +6,7 @@
 -- Copyright   : (c) 2009, 2010, 2011 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Encoding.hs b/Data/Text/Encoding.hs
index 81f995cfe8f57dda63ab19e731dd719889264942..533f604a8baafbe1d5ce47910b77a93e6a9c774f 100644
--- a/Data/Text/Encoding.hs
+++ b/Data/Text/Encoding.hs
@@ -10,8 +10,7 @@
 --               (c) 2008, 2009 Tom Harper
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Encoding/Error.hs b/Data/Text/Encoding/Error.hs
index d38d9a107c6b1ec58aca282e08770b6c31732862..8dda6708fbf9ca665b1513af691c304494538931 100644
--- a/Data/Text/Encoding/Error.hs
+++ b/Data/Text/Encoding/Error.hs
@@ -7,8 +7,7 @@
 -- Copyright   : (c) Bryan O'Sullivan 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Foreign.hs b/Data/Text/Foreign.hs
index 9f006bb6aaa7eaeb5cc676b18fcc0c92307d5783..8f273d9efcd4ccd29ccfff86018fde12d97ca0c4 100644
--- a/Data/Text/Foreign.hs
+++ b/Data/Text/Foreign.hs
@@ -4,8 +4,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal.hs b/Data/Text/Internal.hs
index f6560a9990ffe1cae9306659bc17bf304bcd025a..f2005cc647a68319d955ee9dbedfa70a6e5ffcbd 100644
--- a/Data/Text/Internal.hs
+++ b/Data/Text/Internal.hs
@@ -7,8 +7,7 @@
 --               (c) 2009 Duncan Coutts
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Encoding/Fusion.hs b/Data/Text/Internal/Encoding/Fusion.hs
index 648267b5483a373c03893887aa6b0ccb2a65d251..66b3d0bcbf4fa7551de18fae6ef8c0b41beba795 100644
--- a/Data/Text/Internal/Encoding/Fusion.hs
+++ b/Data/Text/Internal/Encoding/Fusion.hs
@@ -7,8 +7,7 @@
 --               (c) Duncan Coutts 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Encoding/Fusion/Common.hs b/Data/Text/Internal/Encoding/Fusion/Common.hs
index 643b385967363d985093f3b30ad5ce965ca67543..06bd6576a0be15a2345a4842b2bf041029d14e69 100644
--- a/Data/Text/Internal/Encoding/Fusion/Common.hs
+++ b/Data/Text/Internal/Encoding/Fusion/Common.hs
@@ -8,8 +8,7 @@
 --               (c) Jasper Van der Jeugt 2011
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Encoding/Utf16.hs b/Data/Text/Internal/Encoding/Utf16.hs
index 8f4b6af4bf06cae609dc370da17a944066695b7b..e5e3c49e182955e53c298e6c5ed0f5e4d8954fc8 100644
--- a/Data/Text/Internal/Encoding/Utf16.hs
+++ b/Data/Text/Internal/Encoding/Utf16.hs
@@ -7,8 +7,7 @@
 --               (c) 2009 Duncan Coutts
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Encoding/Utf32.hs b/Data/Text/Internal/Encoding/Utf32.hs
index 747a267c377f97669ea3c04b159b5f15604892df..4e8e9b46c2c581926508337a7ca4b948d7a7939f 100644
--- a/Data/Text/Internal/Encoding/Utf32.hs
+++ b/Data/Text/Internal/Encoding/Utf32.hs
@@ -5,8 +5,7 @@
 --               (c) 2009 Duncan Coutts
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Encoding/Utf8.hs b/Data/Text/Internal/Encoding/Utf8.hs
index 45bcc9e82e87ebdb27d0d6824cc9f3a862a447f6..ff2947e4c06e983514171151d6c8623fbbee249a 100644
--- a/Data/Text/Internal/Encoding/Utf8.hs
+++ b/Data/Text/Internal/Encoding/Utf8.hs
@@ -7,8 +7,7 @@
 --               (c) 2009 Duncan Coutts
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Fusion.hs b/Data/Text/Internal/Fusion.hs
index f9385cf8e30ce90010b587647d0b04fa8063605c..830c623ac873519765af52873cf3a0307d516897 100644
--- a/Data/Text/Internal/Fusion.hs
+++ b/Data/Text/Internal/Fusion.hs
@@ -7,8 +7,7 @@
 --               (c) Duncan Coutts 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Fusion/Common.hs b/Data/Text/Internal/Fusion/Common.hs
index 852d224598471e734f19183551c08a37cb86d001..39344f6cd115a070eb74369092cd388227cc4432 100644
--- a/Data/Text/Internal/Fusion/Common.hs
+++ b/Data/Text/Internal/Fusion/Common.hs
@@ -4,8 +4,7 @@
 -- Copyright   : (c) Bryan O'Sullivan 2009, 2012
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Fusion/Size.hs b/Data/Text/Internal/Fusion/Size.hs
index dff5bd146d4f7227e9e102b6f5cf77200db24631..ecfe53e3e8e039177a44a4df7680a71a186189b8 100644
--- a/Data/Text/Internal/Fusion/Size.hs
+++ b/Data/Text/Internal/Fusion/Size.hs
@@ -6,8 +6,7 @@
 --               (c) Bryan O'Sullivan 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Fusion/Types.hs b/Data/Text/Internal/Fusion/Types.hs
index dcc0362e5dfb3001e29ea76d04cc73cffa1e7461..dadf220d5ac33ee10188b1b50c03a4e75c6531d9 100644
--- a/Data/Text/Internal/Fusion/Types.hs
+++ b/Data/Text/Internal/Fusion/Types.hs
@@ -7,8 +7,7 @@
 --               (c) Jasper Van der Jeugt 2011
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Lazy.hs b/Data/Text/Internal/Lazy.hs
index 68c1bf7593329dcc3351b2623c7368ad48df31c0..c252aea670f7c79d6ad5c715b805b59fa7911ec4 100644
--- a/Data/Text/Internal/Lazy.hs
+++ b/Data/Text/Internal/Lazy.hs
@@ -4,8 +4,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Lazy/Encoding/Fusion.hs b/Data/Text/Internal/Lazy/Encoding/Fusion.hs
index cf20e272cd6021bc13c468f6c14d54ba27bb0190..7dafc0a224c8acb140f9342a873c05a3ab913c0a 100644
--- a/Data/Text/Internal/Lazy/Encoding/Fusion.hs
+++ b/Data/Text/Internal/Lazy/Encoding/Fusion.hs
@@ -5,8 +5,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Lazy/Fusion.hs b/Data/Text/Internal/Lazy/Fusion.hs
index 159cb30be060b7ee048445143b63ce15450e7415..cf93287f60f098646771e8b75a84ded6438469ad 100644
--- a/Data/Text/Internal/Lazy/Fusion.hs
+++ b/Data/Text/Internal/Lazy/Fusion.hs
@@ -4,8 +4,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Lazy/Search.hs b/Data/Text/Internal/Lazy/Search.hs
index 6d9552aaf05f6d5d6fb6c8d74af4d7b06d16db10..8af5e2801235577ed11f3b6e5921a91fec3e37c0 100644
--- a/Data/Text/Internal/Lazy/Search.hs
+++ b/Data/Text/Internal/Lazy/Search.hs
@@ -5,8 +5,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Search.hs b/Data/Text/Internal/Search.hs
index 308acd3c7ab927edb1bcb59b8ab39cc96863e0f5..20eda8d3c1d4d1f9f492448771e73de0d2066a33 100644
--- a/Data/Text/Internal/Search.hs
+++ b/Data/Text/Internal/Search.hs
@@ -5,8 +5,7 @@
 -- Copyright   : (c) Bryan O'Sullivan 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Unsafe.hs b/Data/Text/Internal/Unsafe.hs
index d7c9081a0dcb43439de5febc70683e4fd80271d5..0900d19bc67fd4a43c86eee29e9671fc215771ff 100644
--- a/Data/Text/Internal/Unsafe.hs
+++ b/Data/Text/Internal/Unsafe.hs
@@ -3,8 +3,7 @@
 -- Module      : Data.Text.Internal.Unsafe
 -- Copyright   : (c) 2009, 2010, 2011 Bryan O'Sullivan
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Internal/Unsafe/Char.hs b/Data/Text/Internal/Unsafe/Char.hs
index 5f2be50fca9d780169e1d33ab07880c3f804cda1..d208e3f02be875974f31a5ba57896590a9c3ea66 100644
--- a/Data/Text/Internal/Unsafe/Char.hs
+++ b/Data/Text/Internal/Unsafe/Char.hs
@@ -7,8 +7,7 @@
 --               (c) 2009 Duncan Coutts
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Internal/Unsafe/Shift.hs b/Data/Text/Internal/Unsafe/Shift.hs
index aad97c5e74911f6ea045b4e28af16028bdb3d94e..b2fef9b6182cbb2538e394e5ece921ed1034a7b2 100644
--- a/Data/Text/Internal/Unsafe/Shift.hs
+++ b/Data/Text/Internal/Unsafe/Shift.hs
@@ -5,8 +5,7 @@
 -- Copyright   : (c) Bryan O'Sullivan 2009
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Lazy.hs b/Data/Text/Lazy.hs
index 66e751953b80059750078294acdf5f570b6efd13..08dfe587598b568addca6afba2f8f7e70684870f 100644
--- a/Data/Text/Lazy.hs
+++ b/Data/Text/Lazy.hs
@@ -8,8 +8,7 @@
 -- Copyright   : (c) 2009, 2010, 2012 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Lazy/Encoding.hs b/Data/Text/Lazy/Encoding.hs
index 2af8cf8b0ac80287143553077ae018a6606c5557..aaf50af14fd57e6987b7e2988ce2a9f907a2431e 100644
--- a/Data/Text/Lazy/Encoding.hs
+++ b/Data/Text/Lazy/Encoding.hs
@@ -7,8 +7,7 @@
 -- Copyright   : (c) 2009, 2010 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Text/Lazy/Internal.hs b/Data/Text/Lazy/Internal.hs
index a52cde7d6a54615239dd3e3389a923771a08bf6e..4f07f0321ee82c1afa7755a4510b05b28112fbe7 100644
--- a/Data/Text/Lazy/Internal.hs
+++ b/Data/Text/Lazy/Internal.hs
@@ -4,8 +4,7 @@
 -- Copyright   : (c) 2013 Bryan O'Sullivan
 --
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : GHC
 --
diff --git a/Data/Text/Unsafe.hs b/Data/Text/Unsafe.hs
index ffd058bad2af2e4d988f804d635c39edd4af187a..526b56faaf6b5c69f43a34d8edbcd669f7658580 100644
--- a/Data/Text/Unsafe.hs
+++ b/Data/Text/Unsafe.hs
@@ -3,8 +3,7 @@
 -- Module      : Data.Text.Unsafe
 -- Copyright   : (c) 2009, 2010, 2011 Bryan O'Sullivan
 -- License     : BSD-style
--- Maintainer  : bos@serpentine.com, rtomharper@googlemail.com,
---               duncan@haskell.org
+-- Maintainer  : bos@serpentine.com
 -- Stability   : experimental
 -- Portability : portable
 --