diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 12013520d9c0..3b9a662f6c98 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -1,32 +1,34 @@
 PORTNAME=	libcdio
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+DISTVERSION=	2.1.0
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Compact Disc Input and Control Library
 WWW=		https://www.gnu.org/software/libcdio/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcddb.so:audio/libcddb
 TEST_DEPENDS=	genisoimage:sysutils/genisoimage
 
 USES=		compiler:c11 cpe gmake iconv libtool localbase \
 		ncurses pathfix perl5 pkgconfig tar:bzip2
-USE_PERL5=	build
+CPE_VENDOR=	gnu
 USE_LDCONFIG=	yes
+USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
-LIBS+=		${ICONV_LIB}
+CONFIGURE_ARGS=	--disable-cddb \
+		--disable-vcd-info \
+		${ICONV_CONFIGURE_ARG}
 
-INFO=		libcdio
-CPE_VENDOR=	gnu
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+LIBS+=		${ICONV_LIB}
+
+INFO=		libcdio
+
 .include <bsd.port.mk>