diff --git a/.gitignore b/.gitignore
index eb9030141..71ff38198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@
 /src/tools/ebml_validator
 /src/tools/hevc_dump
 /src/tools/hevcc_dump
+/src/tools/pgs_dump
 /src/tools/vc1parser
 /tests/data
 /tests/unit/common/common
diff --git a/Rakefile b/Rakefile
index b7b0925c8..8293fbbe9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -74,7 +74,7 @@ def setup_globals
 
   $programs                =  %w{mkvmerge mkvinfo mkvextract mkvpropedit}
   $programs                << "mkvtoolnix-gui" if $build_mkvtoolnix_gui
-  $tools                   =  %w{ac3parser base64tool bluray_dump checksum diracparser ebml_validator hevc_dump hevcc_dump vc1parser}
+  $tools                   =  %w{ac3parser base64tool bluray_dump checksum diracparser ebml_validator hevc_dump hevcc_dump pgs_dump vc1parser}
 
   $application_subdirs     =  { "mkvtoolnix-gui" => "mkvtoolnix-gui/" }
   $applications            =  $programs.map { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
diff --git a/src/tools/pgs_dump.cpp b/src/tools/pgs_dump.cpp
new file mode 100644
index 000000000..5e68a45dd
--- /dev/null
+++ b/src/tools/pgs_dump.cpp
@@ -0,0 +1,110 @@
+/*
+   hevc_dump - A tool for dumping HEVC structures
+
+   Distributed under the GPL v2
+   see the file COPYING for details
+   or visit http://www.gnu.org/copyleft/gpl.html
+
+   Written by Moritz Bunkus <moritz@bunkus.org>.
+*/
+
+#include "common/common_pch.h"
+
+#include "common/checksums/base_fwd.h"
+#include "common/command_line.h"
+#include "common/hdmv_pgs.h"
+#include "common/mm_io_x.h"
+#include "common/mm_file_io.h"
+#include "common/strings/formatting.h"
+#include "common/timestamp.h"
+#include "common/version.h"
+
+static void
+show_help() {
+  mxinfo("pgs_dump [options] input_file_name\n"
+         "\n"
+         "General options:\n"
+         "\n"
+         "  -h, --help             This help text\n"
+         "  -V, --version          Print version information\n");
+  mxexit();
+}
+
+static void
+show_version() {
+  mxinfo(get_version_info("pgs_dump") + "\n");
+  mxexit();
+}
+
+static std::string
+parse_args(std::vector<std::string> &args) {
+  std::string file_name;
+
+  for (auto & arg: args) {
+    if ((arg == "-h") || (arg == "--help"))
+      show_help();
+
+    else if ((arg == "-V") || (arg == "--version"))
+      show_version();
+
+    else if (!file_name.empty())
+      mxerror(Y("More than one source file was given.\n"));
+
+    else
+      file_name = arg;
+  }
+
+  if (file_name.empty())
+    mxerror(Y("No file name given\n"));
+
+  return file_name;
+}
+
+static void
+parse_file(const std::string &file_name) {
+  mm_file_io_c in{file_name};
+  auto file_size = static_cast<uint64_t>(in.get_size());
+
+  while (in.getFilePointer() < file_size) {
+    auto position = in.getFilePointer();
+    auto magic    = in.read(2);
+
+    if (magic->to_string() != "PG")
+      mxerror(fmt::format("position {}: magic string not found\n", position));
+
+    auto timestamp = timestamp_c::mpeg(in.read_uint32_be());
+
+    in.skip(4);
+
+    auto type         = in.read_uint8();
+    auto segment_size = in.read_uint16_be();
+    auto segment_data = in.read(segment_size);
+
+    if (!segment_data || segment_data->get_size() < segment_size)
+      mxerror(fmt::format("position {}: file truncated\n", position));
+
+    auto adler32 = mtx::checksum::calculate_as_uint(mtx::checksum::algorithm_e::adler32, *segment_data);
+
+    mxinfo(fmt::format("segment at {0:9d} size {1:5d} timestamp {2} checksum 0x{3:08x} type {4:3d} ({5})\n", position, segment_size, format_timestamp(timestamp), adler32, type, mtx::hdmv_pgs::name_for_type(type)));
+  }
+}
+
+int
+main(int argc,
+     char **argv) {
+  mtx_common_init("pgs_dump", argv[0]);
+
+  auto args = mtx::cli::args_in_utf8(argc, argv);
+  while (mtx::cli::handle_common_args(args, "-r"))
+    ;
+
+  auto file_name = parse_args(args);
+
+  try {
+    parse_file(file_name);
+  } catch (mtx::mm_io::exception &) {
+    mxerror(Y("File not found\n"));
+  }
+
+  mxexit();
+}