diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 50173e5d..83c40349 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -17,6 +17,7 @@
 
 New and changed features
 * You can now change a context to a closed state
+* Czech locale has been renamed from cz to cs to follow ISO standards
 
 == Version 2.2
 
diff --git a/doc/upgrading.textile b/doc/upgrading.textile
index 9ebe9a66..de8309ae 100644
--- a/doc/upgrading.textile
+++ b/doc/upgrading.textile
@@ -15,6 +15,8 @@ That said. To upgrade:
 
 Please note that if you intend to use Tracks with the built in webserver called WEBrick for production, you'll need to change @config.serve_static_assets@ to @true@ in @config/environments/production.rb@ in order for the images, stylesheets, and javascript files to be served correctly.
 
+The Czech locale has been renamed from @cz@ to @cs@ in accordance with ISO standards. Users of the Czech locale will need to edit their preferences and reselct the locale under the new name.
+
 h2. Upgrading from Tracks 2.1.x or 2.2RC to 2.2
 
 This release adds a variety of new features and bugfixes to Tracks.