diff --git a/AUTHORS b/AUTHORS
index ebbec53c3..1540a72bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -196,6 +196,9 @@ Player, David <dave@ran.bz>
     * Project files for and fixes for compilation with Microsoft Visual
       Studio 8
 
+Potato <sheppaul@naver.com>
+    * Korean translation
+
 Pöschel, Stefan <basic.master@gmx.de>
     * Bugfixes for open GOPs after I frames in MPEG-1/2 video
 
diff --git a/ChangeLog b/ChangeLog
index 49e5a8491..da2fc55cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-03-21  Moritz Bunkus  <moritz@bunkus.org>
 
+        * all: new feature: added a new translation to Korean by Potato
+        (see AUTHORS).
+
         * MKVToolNix GUI: chapter editor enhancement: added a button next
         to the 'segment UID' controls that enable the user to select a
         Matroska file. The GUI reads that file's segment UID and enters
diff --git a/installer/mkvtoolnix.nsi b/installer/mkvtoolnix.nsi
index 26090729e..c83fa0e90 100644
--- a/installer/mkvtoolnix.nsi
+++ b/installer/mkvtoolnix.nsi
@@ -79,6 +79,7 @@ Page custom showExternalLinks
 !insertmacro LANG_LOAD "German"
 !insertmacro LANG_LOAD "Italian"
 !insertmacro LANG_LOAD "Japanese"
+!insertmacro LANG_LOAD "Korean"
 !insertmacro LANG_LOAD "Lithuanian"
 !insertmacro LANG_LOAD "Polish"
 !insertmacro LANG_LOAD "Portuguese"
diff --git a/installer/translations/Korean.nsh b/installer/translations/Korean.nsh
new file mode 100644
index 000000000..ff9a4fb5e
--- /dev/null
+++ b/installer/translations/Korean.nsh
@@ -0,0 +1,9 @@
+!define LANG "English"
+!insertmacro LANG_STRING STRING_SHORTCUT_ON_DESKTOP "Should a shortcut be placed on the desktop?"
+!insertmacro LANG_STRING STRING_UNINSTALLED_OK "$(^Name) was successfully uninstalled."
+!insertmacro LANG_STRING STRING_REMOVE_PROGRAM_QUESTION "Do you really want to remove $(^Name) and all of its components?"
+!insertmacro LANG_STRING STRING_REMOVE_JOB_FILES_QUESTION "Should job files created by the GUI be deleted as well?"
+
+# Local Variables:
+# mode: nsi
+# End:
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 394c80616..26c81aba1 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -81,6 +81,7 @@ export EXTRA_CONFIGURE_ARGS="--with-boost=/opt/boost"
 %lang(fr) %{_datadir}/locale/fr/*/*.mo
 %lang(it) %{_datadir}/locale/it/*/*.mo
 %lang(ja) %{_datadir}/locale/ja/*/*.mo
+%lang(ko) %{_datadir}/locale/ko/*/*.mo
 %lang(lt) %{_datadir}/locale/lt/*/*.mo
 %lang(nl) %{_datadir}/locale/nl/*/*.mo
 %lang(pl) %{_datadir}/locale/pl/*/*.mo
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index 986a1a738..ce9924933 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -73,6 +73,7 @@ translation_c::initialize_available_translations() {
   ms_available_translations.emplace_back("fre", "fr_FR",       "fr",          "french",     "French",               "Français",            false, 0x000c, 0x00);
   ms_available_translations.emplace_back("ita", "it_IT",       "it",          "italian",    "Italian",              "Italiano",            false, 0x0010, 0x00);
   ms_available_translations.emplace_back("jpn", "ja_JP",       "ja",          "japanese",   "Japanese",             "日本語",              true,  0x0011, 0x00);
+  ms_available_translations.emplace_back("kor", "ko_KR",       "ko",          "korean",     "Korean",               "한국어/조선말",       true,  0x0012, 0x01);
   ms_available_translations.emplace_back("lit", "lt_LT",       "lt",          "lithuanian", "Lithuanian",           "Lietuvių",            false, 0x0027, 0x00);
   ms_available_translations.emplace_back("dut", "nl_NL",       "nl",          "dutch",      "Dutch",                "Nederlands",          false, 0x0013, 0x00);
   ms_available_translations.emplace_back("pol", "pl_PL",       "pl",          "polish",     "Polish",               "Polski",              false, 0x0015, 0x00);
diff --git a/tests/results.txt b/tests/results.txt
index ce10b6de3..a18d93c96 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -384,3 +384,4 @@ T_535chapter_generation_interval_audio_only:4231b50be18c4320584d7e18c611431d-714
 T_536extract_big_endian_pcm:8e57291db3e924e9bb45acb306426a0a:passed:20160307-190156:0.015845204
 T_537srt_bom_precedence_over_sub_charset:9687bc3195f16a852b88c599c17a9f5c-9687bc3195f16a852b88c599c17a9f5c-9687bc3195f16a852b88c599c17a9f5c-32eaa074a254eab81b90bd97be50c425:passed:20160309-180444:0.036282259
 T_538teletext_many_packets_same_content:409dc709d9530f7fe85066af8fc07b7c:passed:20160316-143840:0.650010976
+T_539ui_locale_ko_KR:d81d358bdc4f3cf9244a46229d283c90-e17717e27da110a357b2cc80a6a9e713:passed:20160321-173717:0.024880164
diff --git a/tests/test-539ui_locale_ko_KR.rb b/tests/test-539ui_locale_ko_KR.rb
new file mode 100755
index 000000000..2d0e9f538
--- /dev/null
+++ b/tests/test-539ui_locale_ko_KR.rb
@@ -0,0 +1,4 @@
+#!/usr/bin/ruby -w
+
+# T_539ui_locale_ko_KR
+test_ui_locale "ko_KR"