diff --git a/cinderclient/client.py b/cinderclient/client.py
index 3a4a29688..8e0d3230e 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -1,8 +1,20 @@
-# Copyright 2010 Jacob Kaplan-Moss
 # Copyright 2011 OpenStack LLC.
+# Copyright 2010 Jacob Kaplan-Moss
 # Copyright 2011 Piston Cloud Computing, Inc.
-
 # All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 """
 OpenStack Client interface. Handles the REST calls and responses.
 """
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index 558c29221..1c26656f1 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -1,3 +1,18 @@
+# Copyright 2013 OpenStack LLC
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 import os
 import re
 import sys
diff --git a/cinderclient/v1/client.py b/cinderclient/v1/client.py
index 9d71b60c4..a5b9b0246 100644
--- a/cinderclient/v1/client.py
+++ b/cinderclient/v1/client.py
@@ -1,3 +1,18 @@
+# Copyright 2013 OpenStack LLC
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 from cinderclient import client
 from cinderclient.v1 import limits
 from cinderclient.v1 import quota_classes
diff --git a/cinderclient/v1/contrib/__init__.py b/cinderclient/v1/contrib/__init__.py
index e69de29bb..dc6c3a3f0 100644
--- a/cinderclient/v1/contrib/__init__.py
+++ b/cinderclient/v1/contrib/__init__.py
@@ -0,0 +1,14 @@
+# Copyright 2013 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/cinderclient/v2/client.py b/cinderclient/v2/client.py
index 9e1771816..eb2760c8e 100644
--- a/cinderclient/v2/client.py
+++ b/cinderclient/v2/client.py
@@ -1,3 +1,18 @@
+# Copyright 2013 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 from cinderclient import client
 from cinderclient.v2 import limits
 from cinderclient.v2 import quota_classes