diff --git a/kyototycoon/__init__.py b/kyototycoon/__init__.py
index 3b20399..a7d1342 100644
--- a/kyototycoon/__init__.py
+++ b/kyototycoon/__init__.py
@@ -1,4 +1,11 @@
 # -*- coding: utf-8 -*-
+#
+# Copyright 2011, Toru Maesaka
+# Copyright 2013, Carlos Rodrigues
+#
+# Redistribution and use of this source code is licensed under
+# the BSD license. See COPYING file for license description.
+#
 
 from .kyototycoon import KyotoTycoon
 
diff --git a/kyototycoon/kt_common.py b/kyototycoon/kt_common.py
index 108fe06..c45a2a1 100644
--- a/kyototycoon/kt_common.py
+++ b/kyototycoon/kt_common.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011, Toru Maesaka
+# Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
+#
 
 KT_PACKER_CUSTOM = 0
 KT_PACKER_PICKLE = 1
diff --git a/kyototycoon/kt_error.py b/kyototycoon/kt_error.py
index 51c373f..346059c 100644
--- a/kyototycoon/kt_error.py
+++ b/kyototycoon/kt_error.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright 2011, Toru Maesaka
 # Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
+#
 
 class KyotoTycoonException(Exception):
     pass
diff --git a/kyototycoon/kt_http.py b/kyototycoon/kt_http.py
index 531d88f..f27f2e4 100644
--- a/kyototycoon/kt_http.py
+++ b/kyototycoon/kt_http.py
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011, Toru Maesaka
+# Copyright 2013, Stephen Hamer
+# Copyright 2013, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
+#
 
 import base64
 import struct
diff --git a/kyototycoon/kyotoslave.py b/kyototycoon/kyotoslave.py
index fa95876..610d141 100644
--- a/kyototycoon/kyotoslave.py
+++ b/kyototycoon/kyotoslave.py
@@ -4,6 +4,7 @@
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
+#
 
 import socket
 import struct
diff --git a/kyototycoon/kyototycoon.py b/kyototycoon/kyototycoon.py
index 838c7ac..89ebb93 100644
--- a/kyototycoon/kyototycoon.py
+++ b/kyototycoon/kyototycoon.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2011, Toru Maesaka
+# Copyright 2013, Stephen Hamer
+# Copyright 2013, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
 #
-# Note that python-kyototycoon follows the following interface
-# standard: http://fallabs.com/kyototycoon/kyototycoon.idl
 
 import warnings
 
diff --git a/kyototycoon/packers.py b/kyototycoon/packers.py
index b82d703..def0eb5 100644
--- a/kyototycoon/packers.py
+++ b/kyototycoon/packers.py
@@ -4,6 +4,7 @@
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
+#
 
 import struct
 import gzip
diff --git a/setup.py b/setup.py
index 7fb97fc..8c67429 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #
 # Copyright 2011, Toru Maesaka
+# Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
diff --git a/tests/t_packer_bytes.py b/tests/t_packer_bytes.py
index 1211b89..5ec4001 100644
--- a/tests/t_packer_bytes.py
+++ b/tests/t_packer_bytes.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011, Toru Maesaka
+# Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
diff --git a/tests/t_packer_custom.py b/tests/t_packer_custom.py
index 9705571..0dbe407 100644
--- a/tests/t_packer_custom.py
+++ b/tests/t_packer_custom.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011, Toru Maesaka
+# Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
diff --git a/tests/t_packer_memcache.py b/tests/t_packer_memcache.py
index f522f01..b2d3b75 100644
--- a/tests/t_packer_memcache.py
+++ b/tests/t_packer_memcache.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011, Toru Maesaka
+# Copyright 2015, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
diff --git a/tests/t_packer_smemcache.py b/tests/t_packer_smemcache.py
index 22f0874..e32b81d 100644
--- a/tests/t_packer_smemcache.py
+++ b/tests/t_packer_smemcache.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011, Toru Maesaka
+# Copyright 2015, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.
diff --git a/tests/t_script.py b/tests/t_script.py
index 9498a2e..9ec4d51 100644
--- a/tests/t_script.py
+++ b/tests/t_script.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2011, Toru Maesaka
+# Copyright 2014, Carlos Rodrigues
 #
 # Redistribution and use of this source code is licensed under
 # the BSD license. See COPYING file for license description.