diff --git a/ChangeLog b/ChangeLog
index 2bf541edb..1ddb7d4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-14  Moritz Bunkus  <moritz@bunkus.org>
+
+        * MKVToolNix GUI: bug fix: the options for linking to the
+        next/previous segment UID were wrong. Fixes #1511.
+
 2015-11-10  Moritz Bunkus  <moritz@bunkus.org>
 
         * mkvmerge: enhancement: added JSON as an output format for file
diff --git a/src/mkvtoolnix-gui/merge/mux_config.cpp b/src/mkvtoolnix-gui/merge/mux_config.cpp
index d74bd23b4..593fbad68 100644
--- a/src/mkvtoolnix-gui/merge/mux_config.cpp
+++ b/src/mkvtoolnix-gui/merge/mux_config.cpp
@@ -441,8 +441,8 @@ MuxConfig::buildMkvmergeOptions()
 
   add(Q("--title"), m_title, !m_title.isEmpty() || hasSourceFileWithTitle());
   add(Q("--segment-uid"), m_segmentUIDs);
-  add(Q("--previous-segment-uid"), m_previousSegmentUID);
-  add(Q("--next-segment-uid"), m_nextSegmentUID);
+  add(Q("--link-to-previous"), m_previousSegmentUID);
+  add(Q("--link-to-next"),     m_nextSegmentUID);
   add(Q("--segmentinfo"), m_segmentInfo);
 
   if (!m_chapters.isEmpty()) {