diff --git a/audio/libaiff/Makefile b/audio/libaiff/Makefile
index 58552a2f4c5e..6d11da996811 100644
--- a/audio/libaiff/Makefile
+++ b/audio/libaiff/Makefile
@@ -1,17 +1,21 @@
 PORTNAME=	libaiff
-PORTVERSION=	5.0
-DISTVERSIONSUFFIX=	-release
+DISTVERSIONPREFIX=	v
+DISTVERSION=	6.0
 CATEGORIES=	audio
-MASTER_SITES=	SF/aifftools/${PORTNAME}/LibAiff%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read and write AIFF files
 WWW=		http://aifftools.sourceforge.net/libaiff/
 
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		autoreconf gmake libtool
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	mtszb
 
-PLIST_FILES=	lib/${PORTNAME}.a include/${PORTNAME}/config.h include/${PORTNAME}/endian.h \
-		include/${PORTNAME}/${PORTNAME}.h include/${PORTNAME}/config.vc.h
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/audio/libaiff/distinfo b/audio/libaiff/distinfo
index 2e07328b4904..c6a9e86072da 100644
--- a/audio/libaiff/distinfo
+++ b/audio/libaiff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libaiff-5.0-release.tar.gz) = 0ec0f093151ba1bd7064dca98e0e48d137d12f9ef0f5f20235bb0c6a378334c7
-SIZE (libaiff-5.0-release.tar.gz) = 64539
+TIMESTAMP = 1667428259
+SHA256 (mtszb-libaiff-v6.0_GH0.tar.gz) = 9d90765b2b90942f928698c02ae1b7caf3037847dbe20a100469998f93e61ffd
+SIZE (mtszb-libaiff-v6.0_GH0.tar.gz) = 33447
diff --git a/audio/libaiff/files/patch-Makefile.in b/audio/libaiff/files/patch-Makefile.in
deleted file mode 100644
index 862ef199e47c..000000000000
--- a/audio/libaiff/files/patch-Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in.orig	2007-09-20 19:42:28 UTC
-+++ Makefile.in
-@@ -6,7 +6,7 @@ AR = ar
- CFLAGS = @DEFS@ -I. -Ilibaiff -g -O2 -ansi -pedantic -Wall -Wfloat-equal -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wno-unreachable-code
- 
- # for GCC4. comment for GCC3
--CFLAGS += -Wextra -Wmissing-field-initializers -Wno-discard-qual
-+CFLAGS += -Wextra -Wmissing-field-initializers
- 
- prefix = @prefix@
- 
-@@ -15,14 +15,14 @@ objs = iff.o aifx.o lpcm.o g711.o \
- 
- all: libaiff.a
- 
--install: libaiff.a
--	cp libaiff.a $(prefix)/lib
--	$(RANLIB) $(prefix)/lib/libaiff.a
--	chmod 0444 $(prefix)/lib/libaiff.a
--	cp -R ./libaiff $(prefix)/include/libaiff
--	chmod 0755 $(prefix)/include/libaiff
--	chmod 0444 $(prefix)/include/libaiff/*
--	rm -f $(prefix)/include/libaiff/config.h.in
-+install:
-+	cp libaiff.a $(DESTDIR)$(prefix)/lib
-+	$(RANLIB) $(DESTDIR)$(prefix)/lib/libaiff.a
-+	chmod 0444 $(DESTDIR)$(prefix)/lib/libaiff.a
-+	cp -R ./libaiff $(DESTDIR)$(prefix)/include/libaiff
-+	chmod 0755 $(DESTDIR)$(prefix)/include/libaiff
-+	chmod 0444 $(DESTDIR)$(prefix)/include/libaiff/*
-+	rm -f $(DESTDIR)$(prefix)/include/libaiff/config.h.in
- 
- uninstall: deinstall
- 
diff --git a/audio/libaiff/files/patch-configure b/audio/libaiff/files/patch-configure
deleted file mode 100644
index 94557fe52935..000000000000
--- a/audio/libaiff/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2007-09-20 19:42:28 UTC
-+++ configure
-@@ -645,6 +645,7 @@ libdir
- localedir
- mandir
- DEFS
-+DESTDIR
- ECHO_C
- ECHO_N
- ECHO_T
diff --git a/audio/libaiff/pkg-plist b/audio/libaiff/pkg-plist
new file mode 100644
index 000000000000..3a7f826d3326
--- /dev/null
+++ b/audio/libaiff/pkg-plist
@@ -0,0 +1,6 @@
+include/libaiff/config.h
+include/libaiff/endian.h
+include/libaiff/libaiff.h
+lib/libaiff.so
+lib/libaiff.so.2
+lib/libaiff.so.2.0.0
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index be6ee7bdfa49..85048d6bb8e6 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	umodplayer
 PORTVERSION=	0.b5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/UModPlayer%20B5
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/^0.//:tu}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console module player
 WWW=		http://umodplayer.sourceforge.net/
 
 LICENSE=	PD
 
-LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+LIB_DEPENDS=	libaiff.so:audio/libaiff \
+		libmodplug.so:audio/libmodplug \
 		libao.so:audio/libao
-BUILD_DEPENDS=	${LOCALBASE}/lib/libaiff.a:audio/libaiff
 
 USES=		localbase:ldflags
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS/s| =| +=| ; \
 		 /CFLAGS/s| -O2| $$(CPPFLAGS)|g ; \
 		 /^@/d' ${WRKSRC}/${MAKEFILE}.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>