diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2e9a5dfc..f4904010 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -58,7 +58,7 @@ latex_documents = [
         ('index',
          '%s.tex' % project,
          u'%s Documentation' % project,
-         u'OpenStack LLC', 'manual'),
+         u'OpenStack Foundation', 'manual'),
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
diff --git a/magic/openstack/common/setup.py b/magic/openstack/common/setup.py
index cc8b99e3..ea23a6a2 100644
--- a/magic/openstack/common/setup.py
+++ b/magic/openstack/common/setup.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
 # Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.
 #
diff --git a/oslo/config/iniparser.py b/oslo/config/iniparser.py
index 9bf399f0..3e9ddc4c 100644
--- a/oslo/config/iniparser.py
+++ b/oslo/config/iniparser.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 #
 #    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
diff --git a/tests/test_iniparser.py b/tests/test_iniparser.py
index 7224a2c0..1fb32da6 100644
--- a/tests/test_iniparser.py
+++ b/tests/test_iniparser.py
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2012 OpenStack LLC.
+# Copyright 2012 OpenStack Foundation
 #
 #    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