diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 474bf2dea603..2476d00e0789 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -1,58 +1,58 @@
 # Created by: David Le Brun <david@dyn-ns.net>
 
 PORTNAME=	gnupod
 PORTVERSION=	0.99.8
 PORTREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	SAVANNAH \
 		http://www.blinkenlights.ch/gnupod-dist/stable/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	steve.roome@gmail.com
 COMMENT=	Set of Perl scripts for using an Apple iPod
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-MP3-Info>=0:audio/p5-MP3-Info \
 		p5-XML-Parser>=0:textproc/p5-XML-Parser \
 		p5-TimeDate>=0:devel/p5-TimeDate \
 		p5-Unicode-String>=0:converters/p5-Unicode-String \
 		p5-libwww>=0:www/p5-libwww \
 		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INFO=		gnupod
 
 USES=		makeinfo perl5 tar:tgz
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
 OPTIONS_DEFINE=	FLAC VORBIS DOCS
 
 FLAC_BUILD_DEPENDS=	p5-Audio-FLAC-Header>=0:audio/p5-Audio-FLAC-Header
 FLAC_RUN_DEPENDS=	p5-Audio-FLAC-Header>=0:audio/p5-Audio-FLAC-Header
 VORBIS_BUILD_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
 			oggdec:audio/vorbis-tools
 VORBIS_RUN_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
 			oggdec:audio/vorbis-tools
 
 post-install:
 	# It tries to guess where it should install it's Perl modules, gets it
 	# wrong, and put them in BSDPAN, so move stuff at the right place.
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${MV} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/GNUpod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} 2>/dev/null || :
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 .for file in gnupodrc.example gnutunesdb.example gnupod.html mkspl.html \
 gnupod.texi fdl.texi version.texi ipod.svg
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/gnupod/files/patch-to-fix-gnupod.txt b/audio/gnupod/files/patch-to-fix-gnupod.txt
new file mode 100644
index 000000000000..96ad7116fdc9
--- /dev/null
+++ b/audio/gnupod/files/patch-to-fix-gnupod.txt
@@ -0,0 +1,35 @@
+--- src/ext/FileMagic.pm.orig	2009-07-11 00:20:05.000000000 +0100
++++ src/ext/FileMagic.pm	2022-07-03 22:22:24.750066000 +0100
+@@ -362,7 +362,7 @@
+ 		foreach (keys(%{$in})) {
+ 			my $kvp = __flatten($_, $exclude); # key
+ 			next if !defined($kvp);
+-			my $v = __flatten(%{$in}->{$_}, $exclude); # value
++			my $v = __flatten({$in->{$_}}, $exclude); # value
+ 			$kvp .= " : ".$v     if (defined($v) && ("$v" ne ""));
+ 			push @out, $kvp;
+ 		}
+@@ -418,9 +418,9 @@
+ 	my $case = "check";
+ 
+ 	if (ref($options) eq "HASH") {
+-		$joinby = %{$options}->{joinby}        if defined(%{$options}->{joinby});
+-		$wspace = lc(%{$options}->{wspace})    if defined(%{$options}->{wspace});
+-		$case   = lc(%{$options}->{case})      if defined(%{$options}->{case});
++		$joinby = $options->{joinby}        if $options->{joinby};
++		$wspace = lc($options->{wspace})    if $options->{wspace};
++		$case   = lc($options->{case})      if $options->{case};
+ 	}
+ 	my $merged = "";
+ 
+--- src/ext/XMLhelper.pm.orig	2009-07-11 00:20:05.000000000 +0100
++++ src/ext/XMLhelper.pm	2022-07-03 22:22:34.918120000 +0100
+@@ -359,7 +359,7 @@
+ 			print OUT " </smartplaylist>\n";
+ 		}
+ 		elsif(my $phr = get_plpref($current_plname)) { #plprefs found..
+-			if (defined(@{$XDAT->{playlists}->{data}->{$current_plname}})) { #the playlist is not empty
++			if (@{$XDAT->{playlists}->{data}->{$current_plname}}) { #the playlist is not empty
+ 				print OUT "\n ".mkfile({playlist=>$phr}, {return=>1,noend=>1})."\n";
+ 				foreach(@{$XDAT->{playlists}->{data}->{$current_plname}}) {
+ 					print OUT "   $_\n";