diff --git a/perl-5.31.8-only-install-ExtUtils-XSSymSet-man-page-on-VMS.patch b/perl-5.31.8-only-install-ExtUtils-XSSymSet-man-page-on-VMS.patch
new file mode 100644
index 0000000..66024bc
--- /dev/null
+++ b/perl-5.31.8-only-install-ExtUtils-XSSymSet-man-page-on-VMS.patch
@@ -0,0 +1,37 @@
+From a04fd069805e872c2784733b5dbb94c872ef73d9 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 20 Jan 2020 14:47:38 +1100
+Subject: [PATCH] only install ExtUtils::XSSymSet man page on VMS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This module is only installed on VMS, so there's not much point in
+installing the man page.
+
+An alternative would be to install the module on VMS, but it tries
+to use configuration only set on VMS.
+
+fixes #17424
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Porting/pod_lib.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl
+index f2d854408e..1098074f32 100644
+--- a/Porting/pod_lib.pl
++++ b/Porting/pod_lib.pl
+@@ -330,6 +330,8 @@ sub pods_to_install {
+     # manpages not to be installed
+     my %do_not_install = map { ($_ => 1) }
+         qw(Pod::Functions XS::APItest XS::Typemap);
++    $do_not_install{"ExtUtils::XSSymSet"} = 1
++        unless $^O eq "VMS";
+ 
+     my (%done, %found);
+ 
+-- 
+2.21.1
+
diff --git a/perl.spec b/perl.spec
index 6fd41c8..c07a3f4 100644
--- a/perl.spec
+++ b/perl.spec
@@ -314,6 +314,10 @@ Patch77:        perl-5.31.7-Skip-the-new-open-pragma-tests-for-no-utf8-under-PER
 # Close :unix PerlIO layers properly, in upstream after 5.31.8
 Patch78:        perl-5.31.8-perlio.c-make-unix-close-method-call-underlaying-lay.patch
 
+# Only install ExtUtils::XSSymSet manual page on VMS, GH#17424,
+# in upstream after 5.31.8
+Patch79:        perl-5.31.8-only-install-ExtUtils-XSSymSet-man-page-on-VMS.patch
+
 # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
 Patch200:       perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
 
@@ -4378,6 +4382,7 @@ you're not running VMS, this module does nothing.
 %patch76 -p1
 %patch77 -p1
 %patch78 -p1
+%patch79 -p1
 %patch200 -p1
 %patch201 -p1
 
@@ -4449,6 +4454,7 @@ perl -x patchlevel.h \
     'Fedora Patch76: Fix thread-safety of IO::Handle (GH#14816)' \
     'Fedora Patch77: Fix thread-safety of IO::Handle (GH#14816)' \
     'Fedora Patch78: Close :unix PerlIO layers properly' \
+    'Fedora Patch79: Only install ExtUtils::XSSymSet manual page on VMS (GH#17424)' \
     'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
     'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
     %{nil}
@@ -4670,9 +4676,6 @@ rm %{build_archlib}/.packlist
 # We cannot remove it in %%prep because dist/Cwd/t/Spec.t test needs it.
 rm %{build_archlib}/File/Spec/VMS.pm
 rm $RPM_BUILD_ROOT%{_mandir}/man3/File::Spec::VMS.3*
-# ExtUtils::XSSymSet module is not isntalled, do not install its manual
-# (GH#17424)
-rm $RPM_BUILD_ROOT%{_mandir}/man3/ExtUtils::XSSymSet.3*
 
 # Fix some manpages to be UTF-8
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/