diff --git a/ChangeLog b/ChangeLog
index 161da8a12..390143895 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-23  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mkvmerge: Added support for the "SegmentTitle" (general title of
+        the file written).
+
 2003-07-16  Moritz Bunkus  <moritz@bunkus.org>
 
         * mkvmerge: Added support for UTF-8 and UTF-16 encoded text files
diff --git a/acinclude-2.5.m4 b/acinclude-2.5.m4
index 7d8f2efbc..25adf1b40 100644
--- a/acinclude-2.5.m4
+++ b/acinclude-2.5.m4
@@ -466,6 +466,7 @@ int main ()
     return 1;
   fprintf(f, "%s\n", KaxCodeVersion.c_str());
   fclose(f);
+  yonk();
   return 0;
 }
 
diff --git a/doc/mkvmerge.1 b/doc/mkvmerge.1
index ea0c123af..d50840137 100644
--- a/doc/mkvmerge.1
+++ b/doc/mkvmerge.1
@@ -30,6 +30,12 @@ Suppress status output.
 \fB\-o\fR, \fB\-\-output\fR \fIout\fR
 Write to the file '\fIout\fR'.
 .TP
+\fB\-\-title\fR <\fItitle\fR>
+Sets the general title for the output file, e.g. the movie name.
+
+.LP
+General output control (still global, advanced options):
+.TP
 \fB\-\-cluster\-length \fR \fIn[ms]\fR
 Put at most \fIn\fR data blocks into each cluster. If the number is
 postfixed with 'ms' then put at most \fIn\fR milliseconds of data into
@@ -61,6 +67,9 @@ This option is normally not needed.
 \fB\-\-no\-lacing\fR
 Disable lacing for all tracks. This will increase the file's size, especially
 if there are many audio tracks. This option is not intended for everyday use.
+
+.LP
+File splitting and linking (still global):
 .TP
 \fB\-\-split\fR <\fId[k|m|g]\fR> or \fB\-\-split\fR <\fIHH:MM:SS\fR|\fIns\fR>
 Splits the output file after a given size or a given time. For splitting after
@@ -92,6 +101,9 @@ section \fBFILE LINKING\fR below for details.
 \fB\-\-link\-to\-next\fR <\fIUID\fR>
 Links the last output file to the segment with the given \fIUID\fR. See the
 section \fBFILE LINKING\fR below for details.
+
+.LP
+Attachment support (still global):
 .TP
 \fB\-\-attachment\-description\fR <\fIdescription\fR>
 Plain text description of the following attachment. Applies to the next
diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp
index b8261c4ed..1786fe8e2 100644
--- a/src/mkvmerge.cpp
+++ b/src/mkvmerge.cpp
@@ -151,6 +151,8 @@ KaxDuration *kax_duration;
 KaxSeekHead *kax_seekhead = NULL;
 KaxTags *kax_tags = NULL;
 
+string title;
+
 int64_t tags_size = 0;
 bool accept_tags = true;
 
@@ -204,6 +206,8 @@ static void usage(void) {
     "  -v, --verbose            verbose status\n"
     "  -q, --quiet              suppress status output\n"
     "  -o, --output out         Write to the file 'out'.\n"
+    "  --title <title>          Title for this output file.\n"
+    "\n General output control (still global, advanced options):\n"
     "  --cluster-length <n[ms]> Put at most n data blocks into each cluster.\n"
     "                           If the number is postfixed with 'ms' then\n"
     "                           put at most n milliseconds of data into each\n"
@@ -212,6 +216,7 @@ static void usage(void) {
     "  --no-meta-seek           Do not write any meta seek information.\n"
     "  --meta-seek-size <d>     Reserve d bytes for the meta seek entries.\n"
     "  --no-lacing              Do not use lacing.\n"
+    "\n File splitting and linking (still global):\n"
     "  --split <d[K,M,G]|HH:MM:SS|ns>\n"
     "                           Create a new file after d bytes (KB, MB, GB)\n"
     "                           or after a specific time.\n"
@@ -219,6 +224,7 @@ static void usage(void) {
     "  --dont-link              Don't link splitted files.\n"
     "  --link-to-previous <UID> Link the first file to the given UID.\n"
     "  --link-to-next <UID>     Link the last file to the given UID.\n"
+    "\n Attachment support (still global):\n"
     "  --attachment-description <desc>\n"
     "                           Description for the following attachment.\n"
     "  --attachment-mime-type <mime type>\n"
@@ -704,6 +710,10 @@ static void render_headers(mm_io_c *out, bool last_file, bool first_file) {
       cstr_to_UTFstring(VERSIONINFO);
     GetChild<KaxDateUTC>(*kax_infos).SetEpochDate(time(NULL));
 
+    if (title.length() > 0)
+      *((EbmlUnicodeString *)&GetChild<KaxTitle>(*kax_infos)) =
+        cstr_to_UTFstring(title.c_str());
+
     // Generate the segment UIDs.
     if (first_file) {
       seguid_current.generate_random();
@@ -1071,7 +1081,15 @@ static void parse_args(int argc, char **argv) {
     else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose"))
       verbose = 2;
 
-    else if (!strcmp(argv[i], "--split")) {
+    else if (!strcmp(argv[i], "--title")) {
+      if (((i + 1) >= argc) || (argv[i + 1][0] == 0)) {
+        mxprint(stderr, "Error: --title lacks the title.\n");
+        exit(1);
+      }
+      title = argv[i + 1];
+      i++;
+
+    } else if (!strcmp(argv[i], "--split")) {
       if (((i + 1) >= argc) || (argv[i + 1][0] == 0)) {
         mxprint(stderr, "Error: --split lacks the size.\n");
         exit(1);