diff --git a/README.chromium b/README.chromium
index d78a45c..b9647b9 100644
--- a/README.chromium
+++ b/README.chromium
@@ -250,4 +250,8 @@
    - No upstream bug was filed because the upstream code was completely
      rewritten during the ICU 53 cycle.
 
+14. Fix a bug in locid (getBaseName is wrong).
+   - patches/locid.patch
+   - Upstream bug: http://bugs.icu-project.org/trac/ticket/11421
+
 
diff --git a/patches/locid.patch b/patches/locid.patch
new file mode 100644
index 0000000..cf00bef
--- /dev/null
+++ b/patches/locid.patch
@@ -0,0 +1,18 @@
+Index: source/common/locid.cpp
+===================================================================
+--- source/common/locid.cpp	(revision 36834)
++++ source/common/locid.cpp	(working copy)
+@@ -484,6 +484,13 @@
+         /* preset all fields to empty */
+         language[0] = script[0] = country[0] = 0;
+
++        // Need to reset baseName. Otherwise, when a Locale object created with
++        // the default constructor is changed with setFromPOSIXID() later
++        // (e.g. locales obtained with getAvailableLocales()),
++        // baseName will be still that of the default locale instead of one
++        // corresponding to localeID.
++        baseName = NULL;
++
+         // "canonicalize" the locale ID to ICU/Java format
+         err = U_ZERO_ERROR;
+         length = canonicalize ?