diff --git a/upload/config.php b/upload/config.php
index da5bf1184..900ff3de6 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -270,10 +270,10 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
 		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/';
 		$bb_cfg['default_lang'] = 'ru';
 	}
-	else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ua')
+	else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'uk')
 	{
-		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/';
-		$bb_cfg['default_lang'] = 'ua';
+		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/';
+		$bb_cfg['default_lang'] = 'uk';
 	}
 	else
 	{
@@ -284,14 +284,14 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
 else
 {
 	if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ru') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/';
-	else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ua') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/';
+	else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'uk') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/';
 	else $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/';
 }
 
 $bb_cfg['languages'] = array(
 //	'folder'  => 'Name',
 	'ru'      => 'Русский',
-	'ua'      => 'Український',
+	'uk'      => 'Український',
 	'en'      => 'English',
 );
 
diff --git a/upload/language/ua/.htaccess b/upload/language/uk/.htaccess
similarity index 100%
rename from upload/language/ua/.htaccess
rename to upload/language/uk/.htaccess
diff --git a/upload/language/ua/email/.htaccess b/upload/language/uk/email/.htaccess
similarity index 100%
rename from upload/language/ua/email/.htaccess
rename to upload/language/uk/email/.htaccess
diff --git a/upload/language/ua/email/admin_send_email.tpl b/upload/language/uk/email/admin_send_email.tpl
similarity index 100%
rename from upload/language/ua/email/admin_send_email.tpl
rename to upload/language/uk/email/admin_send_email.tpl
diff --git a/upload/language/ua/email/blank.tpl b/upload/language/uk/email/blank.tpl
similarity index 100%
rename from upload/language/ua/email/blank.tpl
rename to upload/language/uk/email/blank.tpl
diff --git a/upload/language/ua/email/group_added.tpl b/upload/language/uk/email/group_added.tpl
similarity index 100%
rename from upload/language/ua/email/group_added.tpl
rename to upload/language/uk/email/group_added.tpl
diff --git a/upload/language/ua/email/group_approved.tpl b/upload/language/uk/email/group_approved.tpl
similarity index 100%
rename from upload/language/ua/email/group_approved.tpl
rename to upload/language/uk/email/group_approved.tpl
diff --git a/upload/language/ua/email/group_request.tpl b/upload/language/uk/email/group_request.tpl
similarity index 100%
rename from upload/language/ua/email/group_request.tpl
rename to upload/language/uk/email/group_request.tpl
diff --git a/upload/language/ua/email/privmsg_notify.tpl b/upload/language/uk/email/privmsg_notify.tpl
similarity index 100%
rename from upload/language/ua/email/privmsg_notify.tpl
rename to upload/language/uk/email/privmsg_notify.tpl
diff --git a/upload/language/ua/email/profile_send_email.tpl b/upload/language/uk/email/profile_send_email.tpl
similarity index 100%
rename from upload/language/ua/email/profile_send_email.tpl
rename to upload/language/uk/email/profile_send_email.tpl
diff --git a/upload/language/ua/email/topic_notify.tpl b/upload/language/uk/email/topic_notify.tpl
similarity index 100%
rename from upload/language/ua/email/topic_notify.tpl
rename to upload/language/uk/email/topic_notify.tpl
diff --git a/upload/language/ua/email/user_activate.tpl b/upload/language/uk/email/user_activate.tpl
similarity index 100%
rename from upload/language/ua/email/user_activate.tpl
rename to upload/language/uk/email/user_activate.tpl
diff --git a/upload/language/ua/email/user_activate_passwd.tpl b/upload/language/uk/email/user_activate_passwd.tpl
similarity index 100%
rename from upload/language/ua/email/user_activate_passwd.tpl
rename to upload/language/uk/email/user_activate_passwd.tpl
diff --git a/upload/language/ua/email/user_welcome.tpl b/upload/language/uk/email/user_welcome.tpl
similarity index 100%
rename from upload/language/ua/email/user_welcome.tpl
rename to upload/language/uk/email/user_welcome.tpl
diff --git a/upload/language/ua/email/user_welcome_inactive.tpl b/upload/language/uk/email/user_welcome_inactive.tpl
similarity index 100%
rename from upload/language/ua/email/user_welcome_inactive.tpl
rename to upload/language/uk/email/user_welcome_inactive.tpl
diff --git a/upload/language/ua/html/.htaccess b/upload/language/uk/html/.htaccess
similarity index 100%
rename from upload/language/ua/html/.htaccess
rename to upload/language/uk/html/.htaccess
diff --git a/upload/language/ua/html/advert.html b/upload/language/uk/html/advert.html
similarity index 100%
rename from upload/language/ua/html/advert.html
rename to upload/language/uk/html/advert.html
diff --git a/upload/language/ua/html/copyright_holders.html b/upload/language/uk/html/copyright_holders.html
similarity index 100%
rename from upload/language/ua/html/copyright_holders.html
rename to upload/language/uk/html/copyright_holders.html
diff --git a/upload/language/ua/html/not_found.html b/upload/language/uk/html/not_found.html
similarity index 100%
rename from upload/language/ua/html/not_found.html
rename to upload/language/uk/html/not_found.html
diff --git a/upload/language/ua/html/sidebar1.html b/upload/language/uk/html/sidebar1.html
similarity index 100%
rename from upload/language/ua/html/sidebar1.html
rename to upload/language/uk/html/sidebar1.html
diff --git a/upload/language/ua/html/sidebar2.html b/upload/language/uk/html/sidebar2.html
similarity index 100%
rename from upload/language/ua/html/sidebar2.html
rename to upload/language/uk/html/sidebar2.html
diff --git a/upload/language/ua/html/user_agreement.html b/upload/language/uk/html/user_agreement.html
similarity index 100%
rename from upload/language/ua/html/user_agreement.html
rename to upload/language/uk/html/user_agreement.html
diff --git a/upload/language/ua/main.php b/upload/language/uk/main.php
similarity index 99%
rename from upload/language/ua/main.php
rename to upload/language/uk/main.php
index c458fd454..5445b2726 100644
--- a/upload/language/ua/main.php
+++ b/upload/language/uk/main.php
@@ -1,6 +1,6 @@
 <?php
 
-setlocale(LC_ALL, 'ua_UA.UTF-8');
+setlocale(LC_ALL, 'uk_UA.UTF-8');
 $lang['CONTENT_ENCODING'] = 'UTF-8';
 
 //
diff --git a/upload/language/ua/report_hack/.htaccess b/upload/language/uk/report_hack/.htaccess
similarity index 100%
rename from upload/language/ua/report_hack/.htaccess
rename to upload/language/uk/report_hack/.htaccess
diff --git a/upload/language/ua/report_hack/report_general.php b/upload/language/uk/report_hack/report_general.php
similarity index 100%
rename from upload/language/ua/report_hack/report_general.php
rename to upload/language/uk/report_hack/report_general.php
diff --git a/upload/language/ua/report_hack/report_post.php b/upload/language/uk/report_hack/report_post.php
similarity index 100%
rename from upload/language/ua/report_hack/report_post.php
rename to upload/language/uk/report_hack/report_post.php
diff --git a/upload/language/ua/report_hack/report_privmsg.php b/upload/language/uk/report_hack/report_privmsg.php
similarity index 100%
rename from upload/language/ua/report_hack/report_privmsg.php
rename to upload/language/uk/report_hack/report_privmsg.php
diff --git a/upload/language/ua/report_hack/report_topic.php b/upload/language/uk/report_hack/report_topic.php
similarity index 100%
rename from upload/language/ua/report_hack/report_topic.php
rename to upload/language/uk/report_hack/report_topic.php
diff --git a/upload/language/ua/report_hack/report_user.php b/upload/language/uk/report_hack/report_user.php
similarity index 100%
rename from upload/language/ua/report_hack/report_user.php
rename to upload/language/uk/report_hack/report_user.php
diff --git a/upload/language/ua/search_stopwords.txt b/upload/language/uk/search_stopwords.txt
similarity index 100%
rename from upload/language/ua/search_stopwords.txt
rename to upload/language/uk/search_stopwords.txt
diff --git a/upload/language/ua/search_synonyms.txt b/upload/language/uk/search_synonyms.txt
similarity index 100%
rename from upload/language/ua/search_synonyms.txt
rename to upload/language/uk/search_synonyms.txt
diff --git a/upload/language/ua/translit_table.php b/upload/language/uk/translit_table.php
similarity index 100%
rename from upload/language/ua/translit_table.php
rename to upload/language/uk/translit_table.php