diff --git a/Lib/locale.py b/Lib/locale.py
index 2a3930649b3..67a7980f939 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -1264,7 +1264,6 @@ def getpreferredencoding(do_setlocale = True):
     'sr_cs@latn':                           'sr_CS.UTF-8@latin',
     'sr_me':                                'sr_ME.UTF-8',
     'sr_rs':                                'sr_RS.UTF-8',
-    'sr_rs.utf8@latn':                      'sr_RS.UTF-8@latin',
     'sr_rs@latn':                           'sr_RS.UTF-8@latin',
     'sr_sp':                                'sr_CS.ISO8859-2',
     'sr_yu':                                'sr_RS.UTF-8@latin',
diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py
index 980465b42c9..25cb337b961 100755
--- a/Tools/i18n/makelocalealias.py
+++ b/Tools/i18n/makelocalealias.py
@@ -133,7 +133,12 @@ def check(data):
     if args.glibc_supported:
         data.update(parse_glibc_supported(args.glibc_supported))
     data.update(parse(args.locale_alias))
-    data = optimize(data)
+    while True:
+        # Repeat optimization while the size is decreased.
+        n = len(data)
+        data = optimize(data)
+        if len(data) == n:
+            break
     print_differences(data, locale.locale_alias)
     print()
     print('locale_alias = {')