diff --git a/IPython/zmq/parallel/asyncresult.py b/IPython/zmq/parallel/asyncresult.py
index 500ca85..b1ba39b 100644
--- a/IPython/zmq/parallel/asyncresult.py
+++ b/IPython/zmq/parallel/asyncresult.py
@@ -1,6 +1,6 @@
 """AsyncResult objects for the client"""
 #-----------------------------------------------------------------------------
-#  Copyright (C) 2010  The IPython Development Team
+#  Copyright (C) 2010-2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
diff --git a/IPython/zmq/parallel/dependency.py b/IPython/zmq/parallel/dependency.py
index 78e74b4..39fc03e 100644
--- a/IPython/zmq/parallel/dependency.py
+++ b/IPython/zmq/parallel/dependency.py
@@ -1,4 +1,10 @@
 """Dependency utilities"""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 from IPython.external.decorator import decorator
 
diff --git a/IPython/zmq/parallel/engine.py b/IPython/zmq/parallel/engine.py
index c90a0f5..6f05292 100755
--- a/IPython/zmq/parallel/engine.py
+++ b/IPython/zmq/parallel/engine.py
@@ -3,6 +3,13 @@
 it handles registration, etc. and launches a kernel
 connected to the Controller's Schedulers.
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
 from __future__ import print_function
 
 import sys
diff --git a/IPython/zmq/parallel/entry_point.py b/IPython/zmq/parallel/entry_point.py
index 255f05b..193b807 100644
--- a/IPython/zmq/parallel/entry_point.py
+++ b/IPython/zmq/parallel/entry_point.py
@@ -5,6 +5,12 @@ launchers.
 NOTE: Most of this module has been deprecated by moving to Configurables
 ************
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 # Standard library imports.
 import atexit
diff --git a/IPython/zmq/parallel/heartmonitor.py b/IPython/zmq/parallel/heartmonitor.py
index d4cfc68..65bcce1 100644
--- a/IPython/zmq/parallel/heartmonitor.py
+++ b/IPython/zmq/parallel/heartmonitor.py
@@ -3,6 +3,12 @@
 A multi-heart Heartbeat system using PUB and XREP sockets. pings are sent out on the PUB,
 and hearts are tracked based on their XREQ identities.
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 from __future__ import print_function
 import time
diff --git a/IPython/zmq/parallel/ipcluster.py b/IPython/zmq/parallel/ipcluster.py
index 20dfcf6..29dc2e5 100644
--- a/IPython/zmq/parallel/ipcluster.py
+++ b/IPython/zmq/parallel/ipcluster.py
@@ -1,4 +1,11 @@
 #!/usr/bin/env python
+"""Old ipcluster script.  Possibly to be removed."""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 from __future__ import print_function
 
 import os
diff --git a/IPython/zmq/parallel/kernelstarter.py b/IPython/zmq/parallel/kernelstarter.py
index 745ed89..416df17 100644
--- a/IPython/zmq/parallel/kernelstarter.py
+++ b/IPython/zmq/parallel/kernelstarter.py
@@ -1,4 +1,10 @@
 """KernelStarter class that intercepts Control Queue messages, and handles process management."""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 from zmq.eventloop import ioloop
 
diff --git a/IPython/zmq/parallel/remotenamespace.py b/IPython/zmq/parallel/remotenamespace.py
index 315e538..1c1cb4a 100644
--- a/IPython/zmq/parallel/remotenamespace.py
+++ b/IPython/zmq/parallel/remotenamespace.py
@@ -1,5 +1,11 @@
 """RemoteNamespace object, for dict style interaction with a remote
 execution kernel."""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 from functools import wraps
 from IPython.external.decorator import decorator
diff --git a/IPython/zmq/parallel/scheduler.py b/IPython/zmq/parallel/scheduler.py
index 1f56c15..675e442 100644
--- a/IPython/zmq/parallel/scheduler.py
+++ b/IPython/zmq/parallel/scheduler.py
@@ -4,6 +4,12 @@ The Pure ZMQ scheduler does not allow routing schemes other than LRU,
 nor does it check msg_id DAG dependencies. For those, a slightly slower
 Python Scheduler exists.
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------
 # Imports
diff --git a/IPython/zmq/parallel/streamkernel.py b/IPython/zmq/parallel/streamkernel.py
index 446391e..76bc6ba 100755
--- a/IPython/zmq/parallel/streamkernel.py
+++ b/IPython/zmq/parallel/streamkernel.py
@@ -2,6 +2,12 @@
 """
 Kernel adapted from kernel.py to use ZMQ Streams
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
diff --git a/IPython/zmq/parallel/streamsession.py b/IPython/zmq/parallel/streamsession.py
index 5da452d..797d5d1 100644
--- a/IPython/zmq/parallel/streamsession.py
+++ b/IPython/zmq/parallel/streamsession.py
@@ -1,6 +1,12 @@
 #!/usr/bin/env python
 """edited session.py to work with streams, and move msg_type to the header
 """
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 
 import os
diff --git a/IPython/zmq/parallel/taskthread.py b/IPython/zmq/parallel/taskthread.py
index bddaa23..eb845a7 100644
--- a/IPython/zmq/parallel/taskthread.py
+++ b/IPython/zmq/parallel/taskthread.py
@@ -1,4 +1,10 @@
 """Thread for popping Tasks from zmq to Python Queue"""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
 
 
 import time
diff --git a/IPython/zmq/parallel/util.py b/IPython/zmq/parallel/util.py
index 792c2b6..f15aed9 100644
--- a/IPython/zmq/parallel/util.py
+++ b/IPython/zmq/parallel/util.py
@@ -1,4 +1,15 @@
 """some generic utilities for dealing with classes, urls, and serialization"""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2010-2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
 import re
 import socket
 
@@ -15,6 +26,10 @@ from IPython.utils.newserialized import serialize, unserialize
 
 ISO8601="%Y-%m-%dT%H:%M:%S.%f"
 
+#-----------------------------------------------------------------------------
+# Classes
+#-----------------------------------------------------------------------------
+
 class Namespace(dict):
     """Subclass of dict for attribute access to keys."""
     
@@ -64,6 +79,10 @@ class ReverseDict(dict):
         except KeyError:
             return default
 
+#-----------------------------------------------------------------------------
+# Functions
+#-----------------------------------------------------------------------------
+
 def validate_url(url):
     """validate a url for zeromq"""
     if not isinstance(url, basestring):