diff --git a/debian/copyright b/debian/copyright
index 7a2a4c3..b41fb90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,18 @@
 Format: http://dep.debian.net/deps/dep5
 Source: https://gerrit.hpcloud.net/p/automation/hpgit.git
+
 Files: *
-Copyright: 2012 Hewlett-Packard
+Copyright: 2012 Hewlett-Packard Development Company, L.P.
+License: Other/Proprietary
+  Confidential computer software. Valid license from HP required for
+  possession, use or copying. Consistent with FAR 12.211 and 12.212,
+  Commercial Computer Software, Computer Software Documentation, and
+  Technical Data for Commercial Items are licensed to the U.S. Government
+  under vendor's standard commercial license.
+
+
+Files: ghp/subcommand.py ghp/version.py ghp/commands/__init__.py
+Copyright: 2011, 2012 OpenStack LLC.
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -17,3 +28,7 @@ License: Apache-2
  .
  On Debian-based systems the full text of the Apache version 2.0 license
  can be found in `/usr/share/common-licenses/Apache-2.0'.
+Comment:
+ In the case of ghp/version.py and ghp/commands/__init__.py only part of
+ the files are copyright, and as such are marked inline as being taken
+ from another project.
diff --git a/ghp/__init__.py b/ghp/__init__.py
index e69de29..4439c26 100644
--- a/ghp/__init__.py
+++ b/ghp/__init__.py
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
+#
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
+#
diff --git a/ghp/commands/__init__.py b/ghp/commands/__init__.py
index 001ccbc..059db90 100644
--- a/ghp/commands/__init__.py
+++ b/ghp/commands/__init__.py
@@ -1,3 +1,5 @@
+#
+# Copyright (c) 2011 OpenStack LLC.
 # Copyright (c) 2013 Hewlett-Packard
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +26,7 @@ def get_subcommands(subparsers):
     return subcommands
 
 
+# partially taken from python-keystoneclient
 def _find_actions(subparsers, module_path):
     subcommands = {}
     for mod in (p[:-len('.py')] for p in os.listdir(module_path) if p.endswith('.py')):
diff --git a/ghp/commands/import_upstream.py b/ghp/commands/import_upstream.py
index d15ddf1..13354bd 100644
--- a/ghp/commands/import_upstream.py
+++ b/ghp/commands/import_upstream.py
@@ -1,18 +1,12 @@
 #
-# Copyright (c) 2012 Hewlett-Packard
+# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
 #
-# 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
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
 #
-#    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 ghp.errors import HpgitError
 from ghp.log import LogDedentMixin
diff --git a/ghp/errors.py b/ghp/errors.py
index 2ab22ab..e2844ca 100644
--- a/ghp/errors.py
+++ b/ghp/errors.py
@@ -1,18 +1,12 @@
 #
-# Copyright (c) 2013 Hewlett-Packard
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-# 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
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
 #
-#    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.
 
 """Hpgit base error exception"""
 
diff --git a/ghp/log.py b/ghp/log.py
index 44fb754..a91e441 100644
--- a/ghp/log.py
+++ b/ghp/log.py
@@ -1,19 +1,12 @@
-#!/usr/bin/env python
 #
-# Copyright (c) 2013 Hewlett-Packard
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-# 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
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
 #
-#    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.
 
 """
 Custom logging for HP git tool
diff --git a/ghp/main.py b/ghp/main.py
index 126d27b..88659c4 100644
--- a/ghp/main.py
+++ b/ghp/main.py
@@ -1,19 +1,13 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2013 Hewlett-Packard
+# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
 #
-# 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
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
 #
-#    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.
 
 """
 Command-line tool for the HP Cloud workflow
diff --git a/ghp/subcommand.py b/ghp/subcommand.py
index 92c8517..57ff0c8 100644
--- a/ghp/subcommand.py
+++ b/ghp/subcommand.py
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 
+# following function taken from python-keystoneclient - keystoneclient/utils.py
 # Decorator for cli-args
 def arg(*args, **kwargs):
     def _decorator(func):
diff --git a/ghp/version.py b/ghp/version.py
index 8492be4..91f0d6f 100644
--- a/ghp/version.py
+++ b/ghp/version.py
@@ -1,5 +1,6 @@
 #
-# Copyright (c) 2012 Hewlett-Packard
+# Copyright (c) 2011, 2012 OpenStack LLC.
+# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +23,7 @@ import subprocess
 VERBOSE = os.environ.get('VERBOSE', False)
 
 
+# following function is taken from git-review
 def run_command(cmd, status=False, env={}):
     if VERBOSE:
         print(datetime.datetime.now(), "Running:", cmd)
diff --git a/setup.py b/setup.py
index 82a9e5c..eafd15c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,13 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2012 Hewlett-Packard
+# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
 #
-# 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
+# Confidential computer software. Valid license from HP required for
+# possession, use or copying. Consistent with FAR 12.211 and 12.212,
+# Commercial Computer Software, Computer Software Documentation, and
+# Technical Data for Commercial Items are licensed to the U.S. Government
+# under vendor's standard commercial license.
 #
-#    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
@@ -21,7 +15,8 @@ from setuptools import setup, find_packages
 from ghp import version
 
 
-# taken from setuptools example.
+# following function is taken from setuptools example.
+# https://pypi.python.org/pypi/an_example_pypi_project (BSD)
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
@@ -31,7 +26,7 @@ setup(
     author="Darragh Bailey",
     author_email="dbailey@hp.com",
     description=("Tool supporting HPCloud git workflows."),
-    license="Apache License (2.0)",
+    license="Proprietary",
     keywords="git hpcloud workflow",
     url="https://wiki.hpcloud.net/display/auto/hpgit",
     scripts=['git-hp'],
@@ -40,6 +35,6 @@ setup(
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",
         "Topic :: Utilities",
-        "License :: OSI Approved :: Apache License",
+        "License :: Other/Proprietary License",
     ],
 )