diff --git a/installer/data/mysql/atomicupdate/bug_20482_update_language_codes.sql b/installer/data/mysql/atomicupdate/bug_20482_update_language_codes.sql
new file mode 100644
index 0000000000..a06c8fea5a
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_20482_update_language_codes.sql
@@ -0,0 +1,3 @@
+UPDATE language_rfc4646_to_iso639 SET iso639_2_code = 'baq' WHERE iso639_2_code = 'eus' AND rfc4646_subtag = 'eu';
+UPDATE language_rfc4646_to_iso639 SET iso639_2_code = 'mri' WHERE iso639_2_code = 'mri' AND rfc4646_subtag = 'mi';
+UPDATE language_rfc4646_to_iso639 SET iso639_2_code = 'alb' WHERE iso639_2_code = 'sqi' AND rfc4646_subtag = 'sq';
diff --git a/installer/data/mysql/mandatory/subtag_registry.sql b/installer/data/mysql/mandatory/subtag_registry.sql
index 87858d78dd..a815a616c4 100755
--- a/installer/data/mysql/mandatory/subtag_registry.sql
+++ b/installer/data/mysql/mandatory/subtag_registry.sql
@@ -281,7 +281,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'eu', 'language', 'Basque','2014-10-30');
 
 INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
-VALUES ( 'eu','eus');
+VALUES ( 'eu','baq');
 
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES ( 'eu', 'language', 'eu', 'Euskera');
@@ -669,7 +669,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'mi', 'language', 'Maori','2014-10-30');
 
 INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
-VALUES ( 'mi','mri');
+VALUES ( 'mi','mao');
 
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES ( 'mi', 'language', 'mi', 'Te Reo Māori');
@@ -948,7 +948,7 @@ INSERT INTO language_subtag_registry( subtag, type, description, added)
 VALUES ( 'sq', 'language', 'Albanian','2014-10-30');
 
 INSERT INTO language_rfc4646_to_iso639(rfc4646_subtag,iso639_2_code)
-VALUES ( 'sq','sqi');
+VALUES ( 'sq','alb');
 
 INSERT INTO language_descriptions(subtag, type, lang, description)
 VALUES ( 'sq', 'language', 'sq', 'Shqip');