diff --git a/src/bspwm/pkg.sh b/src/bspwm/pkg.sh
index 6310853..715e097 100644
--- a/src/bspwm/pkg.sh
+++ b/src/bspwm/pkg.sh
@@ -1,16 +1,20 @@
 NAME="bspwm"
 DESC="A tiling window manager based on binary space partitioning"
 VERSION="0.9.10"
-FILES=("https://github.com/baskerville/bspwm/archive/refs/tags/$VERSION.tar.gz")
+FILES=("https://github.com/baskerville/bspwm/archive/refs/tags/${VERSION}.tar.gz")
 HASHES=("0d0f5e465b9c27a5c2143c86189392fa297fad55253b9ed8f6854473d3928f8f")
 DEPENDS=(
-  "xcb-util" "xcb-util-keysyms" "xcb-util-wm" 
+  "xcb-util" "xcb-util-keysyms" "xcb-util-wm"
   "libxinerama" "libxrandr" "xauth" "sxhkd"
   "xcb-util" "libxdmcp"
 )
 
 PACKAGE() {
-  tar xf $VERSION.tar.gz && cd $NAME-$VERSION
-  make PREFIX=/usr && make DESTDIR="$ROOTDIR" install
-  cd .. && rm -rf $NAME-$VERSION
+  tar xf "${VERSION}.tar.gz" && cd "${NAME}-${VERSION}"
+
+  make PREFIX=/usr
+  sed 's/cp -Pp/cp -p/g' -i Makefile
+  make DESTDIR="${ROOTDIR}" install
+
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/cdrtools/pkg.sh b/src/cdrtools/pkg.sh
index 4ac2ecd..f54df01 100644
--- a/src/cdrtools/pkg.sh
+++ b/src/cdrtools/pkg.sh
@@ -1,26 +1,26 @@
 NAME="cdrtools"
 DESC="CD recording utilities, useful for reading, creating or writing (burning) CDs, DVDs, and Blu-ray discs"
 VERSION="3.02a09"
-FILES=("https://downloads.sourceforge.net/cdrtools/cdrtools-$VERSION.tar.bz2")
+FILES=("https://downloads.sourceforge.net/cdrtools/cdrtools-${VERSION}.tar.bz2")
 HASHES=("1e224a6adbbe4ad40047b9fddbb0e60c")
 DEPENDS=()
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.bz2
-  cd $NAME-3.02
+  tar xf "${NAME}-${VERSION}.tar.bz2"
+  cd "${NAME}-${VERSION%a*}"
 
-  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
-  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
-  sed -i 's|INSDIR=.*|INSDIR=bin|' rscsi/Makefile
-	rm -rfv cdda2wav # this is broken
+  #sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
+  #sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
+  #sed -i 's|INSDIR=.*|INSDIR=bin|' rscsi/Makefile
+	#rm -rfv cdda2wav # this is broken
 
   export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/ LDOPTX="$LDFLAGS"
-	make INS_BASE=/usr INS_RBASE=/ DESTDIR="$ROOTDIR" install
+  make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root
+  make DESTDIR="${ROOTDIR}" INS_BASE=/usr MANSUFF_LIB=3cdr DEFINSUSR=root DEFINSGRP=root install
 
-	install -v -m755 -d $ROOTDIR/usr/share/doc/cdrtools-$VERSION
+	install -v -m755 -d "${ROOTDIR}/usr/share/doc/cdrtools-${VERSION}"
 	install -v -m644 README.* READMEs/* ABOUT doc/*.ps \
-                    $ROOTDIR/usr/share/doc/cdrtools-$VERSION
+                   "${ROOTDIR}/usr/share/doc/cdrtools-${VERSION}"
 
-  cd .. && rm -rf $NAME-3.02
+  cd .. && rm -r "${NAME}-${VERSION%a*}"
 }