diff --git a/README.rst b/README.rst
index 858713c..6310ba3 100644
--- a/README.rst
+++ b/README.rst
@@ -91,12 +91,12 @@ The latest source code can always be found here: `github.com/notanumber/xapian-h
 Credits
 -------
 
-xapian-haystack is maintained by `David Sauve <mailto:dsauve@gmail.com>`_, and was originally funded by `Trapeze <http://www.trapeze.com>`_.
+xapian-haystack is maintained by `David Sauve <mailto:david.sauve@bag-of-holding.com>`_, and was originally funded by `Trapeze <http://www.trapeze.com>`_.
 
 License
 -------
 
-xapian-haystack is Copyright (c) 2009-2011 David Sauve, Trapeze. It is free software, and may be redistributed under the terms specified in the LICENSE file. 
+xapian-haystack is Copyright (c) 2009, 2010, 2011 David Sauve, 2009, 2010 Trapeze. It is free software, and may be redistributed under the terms specified in the LICENSE file. 
 
 Questions, Comments, Concerns:
 ------------------------------
diff --git a/tests/xapian_settings.py b/tests/xapian_settings.py
index f5732bb..ecfbe4b 100755
--- a/tests/xapian_settings.py
+++ b/tests/xapian_settings.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
 
 import os
 from settings import *
diff --git a/tests/xapian_tests/__init__.py b/tests/xapian_tests/__init__.py
index 91e7482..d0dcb66 100644
--- a/tests/xapian_tests/__init__.py
+++ b/tests/xapian_tests/__init__.py
@@ -1 +1,2 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
\ No newline at end of file
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
diff --git a/tests/xapian_tests/models.py b/tests/xapian_tests/models.py
index 91e7482..d0dcb66 100644
--- a/tests/xapian_tests/models.py
+++ b/tests/xapian_tests/models.py
@@ -1 +1,2 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
\ No newline at end of file
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
diff --git a/tests/xapian_tests/tests/__init__.py b/tests/xapian_tests/tests/__init__.py
index 5eaa148..13030c7 100644
--- a/tests/xapian_tests/tests/__init__.py
+++ b/tests/xapian_tests/tests/__init__.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
 
 import warnings
 
diff --git a/tests/xapian_tests/tests/xapian_backend.py b/tests/xapian_tests/tests/xapian_backend.py
index 728ad00..b120cb7 100644
--- a/tests/xapian_tests/tests/xapian_backend.py
+++ b/tests/xapian_tests/tests/xapian_backend.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
+
 # Based on original code by Daniel Lindsley as part of the Haystack test suite.
 
 import cPickle as pickle
diff --git a/tests/xapian_tests/tests/xapian_query.py b/tests/xapian_tests/tests/xapian_query.py
index ceff830..fb64ee6 100644
--- a/tests/xapian_tests/tests/xapian_query.py
+++ b/tests/xapian_tests/tests/xapian_query.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
 
 import datetime
 import os
diff --git a/xapian_backend.py b/xapian_backend.py
index 3a7b2a7..8de16ed 100755
--- a/xapian_backend.py
+++ b/xapian_backend.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2011 David Sauve, Trapeze.  All rights reserved.
+# Copyright (C) 2009, 2010, 2011 David Sauve
+# Copyright (C) 2009, 2010 Trapeze
 
 __author__ = 'David Sauve'
 __version__ = (1, 1, 5, 'beta')