diff --git a/libcddb/.signature b/libcddb/.signature
index c2fc8e1cd..fbb323bef 100644
--- a/libcddb/.signature
+++ b/libcddb/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+i982NRXB0udxKm05rVVpsTPwDN1uKeQ3HREbPj4bsc+xVGs734PfCVUvO7pSJrdS/ntmdhf+4XL1yyx3xLTA0=
-SHA256 (Pkgfile) = 313f2f7db4043c33f1a8ebdd927f0d7df14f1d9dada0241f120164af9bd49e17
+RWSagIOpLGJF36WjmSNgzADbDzwTIBCfiLISX4UQh7JPasHTodUK14Ud5+eM6Q1jvyayYetQZQkJa4udMHKLAfVRK1i2DOlXVQE=
+SHA256 (Pkgfile) = e7d8ff49282ea35aed65d3b94a73c0c0d8c3ede29ad2525d5b2cf4ceaf5fbf6f
 SHA256 (.footprint) = 165cd8bd9fbcfca11c66aaf56f023245e94355ba1c0d2f3e9778ae64daf1b9e2
 SHA256 (libcddb-1.3.2.tar.bz2) = 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b
diff --git a/libcddb/Pkgfile b/libcddb/Pkgfile
index 0e04fca86..ce84d1c7f 100644
--- a/libcddb/Pkgfile
+++ b/libcddb/Pkgfile
@@ -1,7 +1,6 @@
 # Description: Library to access and submit data on a CDDB server.
 # URL: http://libcddb.sourceforge.net/
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Han Boetes, han at mijncomputer dot nl
+# Maintainer: John McQuah, jmcquah at disroot dot org
 
 name=libcddb
 version=1.3.2
@@ -11,7 +10,8 @@ source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr
+	./configure --prefix=/usr \
+		--without-cdio
 
 	make
 	make DESTDIR=$PKG install
diff --git a/libcdio-paranoia/.signature b/libcdio-paranoia/.signature
index d86997686..9d1638088 100644
--- a/libcdio-paranoia/.signature
+++ b/libcdio-paranoia/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF341mvLr3luSS/d/ZnC/yfM4KY2bj1AjINDCY0IETKeSR03moezPbCsAlhr+NacxKJnP3VXLGEmQsn0zYTwrF2QM=
-SHA256 (Pkgfile) = c1a6b5103f0d77ed92e28b36abdb100da44cb40db97dfa99c7b08109dab97f2d
+RWSagIOpLGJF39Att/dFp2YtzZQXcjGkNUPcDvyIZUnd8fmApeh+222OjldSUX7EomXz+eIer6oKSx1aLajgPeZPgzXrCshFOAg=
+SHA256 (Pkgfile) = 54fc40f18ad83d829a5f9b1211ca2ec4da630747238af6ca53bc9cdb162268dc
 SHA256 (.footprint) = 2e882fff9f854e3675f7c777ac177c5bb703d4f5d1c26dce60f801d3ad7ac341
 SHA256 (libcdio-paranoia-10.2+2.0.1.tar.gz) = 28d7d00e4a83d0221acda0fd2eb3e3240bf094db4c00a85998922201939fa952
diff --git a/libcdio-paranoia/Pkgfile b/libcdio-paranoia/Pkgfile
index 150be0eef..67d9db131 100644
--- a/libcdio-paranoia/Pkgfile
+++ b/libcdio-paranoia/Pkgfile
@@ -1,6 +1,6 @@
 # Description: CD paranoia libraries from libcdio
-# URL: http://www.gnu.org/software/libcdio/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# URL: https://github.com/rocky/libcdio-paranoia
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: libcdio
 
 name=libcdio-paranoia
@@ -13,10 +13,8 @@ build() {
 
 	./configure \
 		--prefix=/usr \
-		--enable-cpp-progs \
 		--disable-example-progs
 		
-
 	make
 	make DESTDIR=$PKG install
 
diff --git a/libcdio/.signature b/libcdio/.signature
index b42a3b900..39c489c1a 100644
--- a/libcdio/.signature
+++ b/libcdio/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30CYSzy8rDTKFPZjahFcHnVaJFGf25r5rA8YTtz6z6TbsKJJsyTtK3HSOV8qpIcjvpLJprls8BQ0Ltc1V/FeYAk=
-SHA256 (Pkgfile) = bcd27fc61217393ff4a13e21ec0ead717300c5542484d615768e5edc900ec1b6
+RWSagIOpLGJF34jH9e5qFNGkTPnA+37jmSImgUKbFO7eAUI1pX++QQmW6oZTJTf3ycrYeS1pVgH0E1FeIl0O+F0BfcppzVE+/gs=
+SHA256 (Pkgfile) = d04ff2f5ef0afc917ebea85461e887e054751eb343024bf0766a845ed0ec4f72
 SHA256 (.footprint) = 462509477e2b2c50ea440cda54fd6520ca35cfe436c9fe15b76daa90e03d0f75
 SHA256 (libcdio-2.1.0.tar.bz2) = 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b
diff --git a/libcdio/Pkgfile b/libcdio/Pkgfile
index 408eae3d6..e0761e33f 100644
--- a/libcdio/Pkgfile
+++ b/libcdio/Pkgfile
@@ -1,6 +1,6 @@
 # Description: A library for CD-ROM and CD image access.
 # URL: http://www.gnu.org/software/libcdio/
-# Maintainer: Danny Rawlins, crux at romster dot me
+# Maintainer: John McQuah, jmcquah at disroot dot org
 # Depends on: libcddb ncurses
 
 name=libcdio