diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index e32433bd854c..a5ce784d9bfd 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -1,66 +1,71 @@
 # Created by: Aragon Gouveia <aragon@phat.za.net>
 
 PORTNAME=	alsa-utils
 PORTVERSION=	1.2.2
+PORTREVISION=	1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/ \
-		GENTOO
+MASTER_SITES=	GH
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	alsa-project
+GH_PROJECT=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ALSA compatibility utilities
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfftw3f.so:math/fftw3-float \
 		libinotify.so:devel/libinotify
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 
 USES=		autoreconf gettext-tools gmake libtool localbase ncurses shebangfix \
 		tar:bzip2 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-udev-rules-dir="\$${prefix}/lib/udev"
 SHEBANG_FILES=	alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${.CURDIR}/../alsa-lib/files
 CFLAGS+=	-Dlseek64=lseek -DSCHED_IDLE=SCHED_OTHER \
 		-I${LOCALBASE}/include/libepoll-shim
 LDFLAGS+=	-linotify -lepoll-shim
 
 OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		BAT MANPAGES NLS SAMPLERATE
 OPTIONS_DEFAULT=	BAT MANPAGES
 
 BAT_DESC=		Basic Audio Tester support
 BAT_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 			libfftw3f.so:math/fftw3-float
 BAT_CONFIGURE_ENABLE=	bat
 
 MANPAGES_BUILD_DEPENDS=		minixmlto:textproc/minixmlto
 MANPAGES_CONFIGURE_ENV=		ac_cv_prog_xmlto=minixmlto
 MANPAGES_CONFIGURE_ENABLE=	xmlto
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LIBS=		-lintl
 
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENV_OFF=	ac_cv_header_samplerate_h=no
 
 post-patch:
 	@${REINPLACE_CMD} \
 		's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/alsactl/alsactl_init.xml \
 		${WRKSRC}/speaker-test/speaker-test.1 \
 		${WRKSRC}/speaker-test/samples/sample_map.csv \
 		${WRKSRC}/alsaconf/alsaconf.fr.8 \
 		${WRKSRC}/alsaconf/alsaconf.8 \
 		${WRKSRC}/utils/alsa-utils.spec.in \
 		${WRKSRC}/amidi/amidi.1
 	@${REINPLACE_CMD} \
 		's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/alsa-info/alsa-info.sh.1 \
 		${WRKSRC}/amidi/amidi.1
 
 .include <bsd.port.mk>
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo
index 55464f24cd0b..7af3684defc2 100644
--- a/audio/alsa-utils/distinfo
+++ b/audio/alsa-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615527978
-SHA256 (alsa-utils-1.2.2.tar.bz2) = 44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3
-SIZE (alsa-utils-1.2.2.tar.bz2) = 1274821
+TIMESTAMP = 1634081670
+SHA256 (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 9da1ce4f12a4dd56d55cd5a8f6ae7d56ac91397c3d37fdfcd737adeeb34fce1c
+SIZE (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 1252639
diff --git a/audio/alsa-utils/files/patch-alsactl_Makefile.am b/audio/alsa-utils/files/patch-alsactl_Makefile.am
new file mode 100644
index 000000000000..43e54d03abe3
--- /dev/null
+++ b/audio/alsa-utils/files/patch-alsactl_Makefile.am
@@ -0,0 +1,8 @@
+--- alsactl/Makefile.am.orig	2020-02-19 12:02:10 UTC
++++ alsactl/Makefile.am
+@@ -66,4 +66,4 @@ CLEANFILES = \
+ 	90-alsa-restore.rules
+ 
+ %.7: %.xml
+-	xmlto man $?
++	$(xmlto) man $?
diff --git a/audio/alsa-utils/files/patch-alsactl_Makefile.in b/audio/alsa-utils/files/patch-alsactl_Makefile.in
deleted file mode 100644
index 298b89b22cd8..000000000000
--- a/audio/alsa-utils/files/patch-alsactl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsactl/Makefile.in.orig	2021-03-12 04:46:51 UTC
-+++ alsactl/Makefile.in
-@@ -1110,7 +1110,7 @@ alsa-restore.service: alsa-restore.service.in
- 	$(edit)
- 
- %.7: %.xml
--	xmlto man $?
-+	$(xmlto) man $?
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.