diff --git a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
index 44915f4020..234880dc77 100644
--- a/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
+++ b/keystone/locale/bg_BG/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Bulgarian (Bulgaria) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/bs/LC_MESSAGES/keystone.po b/keystone/locale/bs/LC_MESSAGES/keystone.po
index 8970a4b51c..d7027e32a1 100644
--- a/keystone/locale/bs/LC_MESSAGES/keystone.po
+++ b/keystone/locale/bs/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Bosnian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/cs/LC_MESSAGES/keystone.po b/keystone/locale/cs/LC_MESSAGES/keystone.po
index 38f07e8879..0a6c2b8ea4 100644
--- a/keystone/locale/cs/LC_MESSAGES/keystone.po
+++ b/keystone/locale/cs/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Czech translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/da/LC_MESSAGES/keystone.po b/keystone/locale/da/LC_MESSAGES/keystone.po
index c23a40dbfa..e6dcc4b8b7 100644
--- a/keystone/locale/da/LC_MESSAGES/keystone.po
+++ b/keystone/locale/da/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Danish translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/de/LC_MESSAGES/keystone.po b/keystone/locale/de/LC_MESSAGES/keystone.po
index 2328ca77ee..82f7360000 100644
--- a/keystone/locale/de/LC_MESSAGES/keystone.po
+++ b/keystone/locale/de/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # German translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/en_AU/LC_MESSAGES/keystone.po b/keystone/locale/en_AU/LC_MESSAGES/keystone.po
index 04a9e25b99..d46c3e2f92 100644
--- a/keystone/locale/en_AU/LC_MESSAGES/keystone.po
+++ b/keystone/locale/en_AU/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # English (Australia) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/en_GB/LC_MESSAGES/keystone.po b/keystone/locale/en_GB/LC_MESSAGES/keystone.po
index 7a78cab564..8ef8b094b7 100644
--- a/keystone/locale/en_GB/LC_MESSAGES/keystone.po
+++ b/keystone/locale/en_GB/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # English (United Kingdom) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/en_US/LC_MESSAGES/keystone.po b/keystone/locale/en_US/LC_MESSAGES/keystone.po
index f123bbafbc..8392d936dc 100644
--- a/keystone/locale/en_US/LC_MESSAGES/keystone.po
+++ b/keystone/locale/en_US/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # English (United States) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/es/LC_MESSAGES/keystone.po b/keystone/locale/es/LC_MESSAGES/keystone.po
index 89399df714..be14f7c342 100644
--- a/keystone/locale/es/LC_MESSAGES/keystone.po
+++ b/keystone/locale/es/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Spanish translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/es_MX/LC_MESSAGES/keystone.po b/keystone/locale/es_MX/LC_MESSAGES/keystone.po
index b795f53ce4..1002ccba5e 100644
--- a/keystone/locale/es_MX/LC_MESSAGES/keystone.po
+++ b/keystone/locale/es_MX/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Spanish (Mexico) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
index 92c9e60f1a..7f8e148957 100644
--- a/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fi_FI/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Finnish (Finland) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/fr/LC_MESSAGES/keystone.po b/keystone/locale/fr/LC_MESSAGES/keystone.po
index 580e38954f..d7d6402415 100644
--- a/keystone/locale/fr/LC_MESSAGES/keystone.po
+++ b/keystone/locale/fr/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # French translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/hi/LC_MESSAGES/keystone.po b/keystone/locale/hi/LC_MESSAGES/keystone.po
index 0bb774bac1..af4d544102 100644
--- a/keystone/locale/hi/LC_MESSAGES/keystone.po
+++ b/keystone/locale/hi/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Hindi translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/hr/LC_MESSAGES/keystone.po b/keystone/locale/hr/LC_MESSAGES/keystone.po
index ac3e8738e5..663b75426c 100644
--- a/keystone/locale/hr/LC_MESSAGES/keystone.po
+++ b/keystone/locale/hr/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Croatian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/hu/LC_MESSAGES/keystone.po b/keystone/locale/hu/LC_MESSAGES/keystone.po
index 5e85359f40..eb868b193b 100644
--- a/keystone/locale/hu/LC_MESSAGES/keystone.po
+++ b/keystone/locale/hu/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Hungarian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/id/LC_MESSAGES/keystone.po b/keystone/locale/id/LC_MESSAGES/keystone.po
index 0c41400a95..369a1420c2 100644
--- a/keystone/locale/id/LC_MESSAGES/keystone.po
+++ b/keystone/locale/id/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Indonesian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/it/LC_MESSAGES/keystone.po b/keystone/locale/it/LC_MESSAGES/keystone.po
index 980b069951..50b2984880 100644
--- a/keystone/locale/it/LC_MESSAGES/keystone.po
+++ b/keystone/locale/it/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Italian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/it_IT/LC_MESSAGES/keystone.po b/keystone/locale/it_IT/LC_MESSAGES/keystone.po
index 538fb8da92..185e8b1c68 100644
--- a/keystone/locale/it_IT/LC_MESSAGES/keystone.po
+++ b/keystone/locale/it_IT/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Italian (Italy) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
index 46d0b43026..ec7efaa801 100644
--- a/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ka_GE/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Georgian (Georgia) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/keystone.pot b/keystone/locale/keystone.pot
index afd1ee84be..b97acf1b39 100644
--- a/keystone/locale/keystone.pot
+++ b/keystone/locale/keystone.pot
@@ -1,5 +1,5 @@
 # Translations template for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
diff --git a/keystone/locale/ko/LC_MESSAGES/keystone.po b/keystone/locale/ko/LC_MESSAGES/keystone.po
index 1002238b8b..63f3da65fe 100644
--- a/keystone/locale/ko/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ko/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Korean translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
index 4a8ebe75d0..48811b9c17 100644
--- a/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ko_KR/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Korean (South Korea) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ms/LC_MESSAGES/keystone.po b/keystone/locale/ms/LC_MESSAGES/keystone.po
index b00fca6b91..a9d9d66778 100644
--- a/keystone/locale/ms/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ms/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Malay translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/nb/LC_MESSAGES/keystone.po b/keystone/locale/nb/LC_MESSAGES/keystone.po
index 9393fc2eb4..5de65ef510 100644
--- a/keystone/locale/nb/LC_MESSAGES/keystone.po
+++ b/keystone/locale/nb/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Norwegian Bokmål translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ne/LC_MESSAGES/keystone.po b/keystone/locale/ne/LC_MESSAGES/keystone.po
index 81cf6e579f..2b2130e3b4 100644
--- a/keystone/locale/ne/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ne/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Nepali translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/nl_NL/LC_MESSAGES/keystone.po b/keystone/locale/nl_NL/LC_MESSAGES/keystone.po
index 4d6abde499..446b707a28 100644
--- a/keystone/locale/nl_NL/LC_MESSAGES/keystone.po
+++ b/keystone/locale/nl_NL/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Dutch (Netherlands) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/pl_PL/LC_MESSAGES/keystone.po b/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
index 5066764292..f0af278d39 100644
--- a/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pl_PL/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Polish (Poland) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/pt/LC_MESSAGES/keystone.po b/keystone/locale/pt/LC_MESSAGES/keystone.po
index b21155543e..91efbee3fa 100644
--- a/keystone/locale/pt/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Portuguese translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
index 6339ff0586..b384675ef9 100644
--- a/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/pt_BR/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Portuguese (Brazil) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ro/LC_MESSAGES/keystone.po b/keystone/locale/ro/LC_MESSAGES/keystone.po
index aab8d0d869..c8fdb73404 100644
--- a/keystone/locale/ro/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ro/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Romanian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ru/LC_MESSAGES/keystone.po b/keystone/locale/ru/LC_MESSAGES/keystone.po
index 23d4dfcfc0..d3349009be 100644
--- a/keystone/locale/ru/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ru/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Russian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/ru_RU/LC_MESSAGES/keystone.po b/keystone/locale/ru_RU/LC_MESSAGES/keystone.po
index 2861143623..61c75b167e 100644
--- a/keystone/locale/ru_RU/LC_MESSAGES/keystone.po
+++ b/keystone/locale/ru_RU/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Russian (Russia) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/sk/LC_MESSAGES/keystone.po b/keystone/locale/sk/LC_MESSAGES/keystone.po
index bd38baf24d..39be162394 100644
--- a/keystone/locale/sk/LC_MESSAGES/keystone.po
+++ b/keystone/locale/sk/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Slovak translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/sl_SI/LC_MESSAGES/keystone.po b/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
index 9bdfaff567..9280a3c02d 100644
--- a/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
+++ b/keystone/locale/sl_SI/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Slovenian (Slovenia) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/sw_KE/LC_MESSAGES/keystone.po b/keystone/locale/sw_KE/LC_MESSAGES/keystone.po
index 958b115f07..0b6bc55c1e 100644
--- a/keystone/locale/sw_KE/LC_MESSAGES/keystone.po
+++ b/keystone/locale/sw_KE/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Swahili (Kenya) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/tl/LC_MESSAGES/keystone.po b/keystone/locale/tl/LC_MESSAGES/keystone.po
index 5e6d3ccdc8..d7e6c70111 100644
--- a/keystone/locale/tl/LC_MESSAGES/keystone.po
+++ b/keystone/locale/tl/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Filipino (Philippines) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/tr_TR/LC_MESSAGES/keystone.po b/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
index f66d4f92fc..7cd9f828df 100644
--- a/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
+++ b/keystone/locale/tr_TR/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Turkish (Turkey) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/uk/LC_MESSAGES/keystone.po b/keystone/locale/uk/LC_MESSAGES/keystone.po
index 411a782698..ee6fe177cd 100644
--- a/keystone/locale/uk/LC_MESSAGES/keystone.po
+++ b/keystone/locale/uk/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Ukrainian translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
index df0b5d43b7..9a9e20d464 100644
--- a/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/vi_VN/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Vietnamese (Vietnam) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
index 3600c88b74..5e23266a3a 100644
--- a/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_CN/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Chinese (China) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/zh_HK/LC_MESSAGES/keystone.po b/keystone/locale/zh_HK/LC_MESSAGES/keystone.po
index ebf5ab29e6..596aac187a 100644
--- a/keystone/locale/zh_HK/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_HK/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Chinese (Traditional, Hong Kong SAR China) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
index 6a016121e2..da7380fc4f 100644
--- a/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
+++ b/keystone/locale/zh_TW/LC_MESSAGES/keystone.po
@@ -1,5 +1,5 @@
 # Chinese (Taiwan) translations for keystone.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2013 OpenStack Foundation
 # This file is distributed under the same license as the keystone project.
 #
 # Translators:
diff --git a/setup.cfg b/setup.cfg
index 8bce3b3da3..78d450ea69 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -53,6 +53,8 @@ input_file = keystone/locale/keystone.pot
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = keystone/locale/keystone.pot
+copyright_holder = OpenStack Foundation
+msgid_bugs_address = https://bugs.launchpad.net/keystone
 
 [nosetests]
 # NOTE(jkoelker) To run the test suite under nose install the following