diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD
index 3f8e07b4584a0ef590e9bac71f7a1cd40f25f167..e6187c747abcd3a6a94490a57c9d3de11b91b8ec 100644
--- a/user/libmtp/APKBUILD
+++ b/user/libmtp/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
 source="https://downloads.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libxaw/APKBUILD b/user/libxaw/APKBUILD
index a817b0bb13f14682a5500d3862d969f57e56b318..3dd5985566827a3704a0f98b1a689b1defa3bd04 100644
--- a/user/libxaw/APKBUILD
+++ b/user/libxaw/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXaw-$pkgver.tar.bz2"
 builddir="$srcdir"/libXaw-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xbitmaps/APKBUILD b/user/xbitmaps/APKBUILD
index 47ca8efca3995230123c372a5615653859da9941..3052984ef6ce7b05093c2e9e2a9ad103a8f4e790 100644
--- a/user/xbitmaps/APKBUILD
+++ b/user/xbitmaps/APKBUILD
@@ -8,10 +8,10 @@ arch="noarch"
 license="X11"
 depends="util-macros"
 makedepends=""
+subpackages=""
 source="https://www.X.Org/releases/individual/data/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -20,12 +20,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xmessage/APKBUILD b/user/xmessage/APKBUILD
index 145daeec0e591b68475363563dcc36bfb915f4df..21c5cf84a72989e263666d5f09aa77f160fe1a52 100644
--- a/user/xmessage/APKBUILD
+++ b/user/xmessage/APKBUILD
@@ -6,12 +6,12 @@ pkgdesc="Display a message or query in a window"
 url="https://www.X.Org/"
 arch="all"
 license="X11"
+depends=""
 makedepends="libx11-dev libxaw-dev util-macros"
 subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xset/APKBUILD b/user/xset/APKBUILD
index 9abfb3d464a0a3eaed84799bc8a9feaeacf6eb27..e751862c21c1bde3c41b10c5b4f2b65039159b3d 100644
--- a/user/xset/APKBUILD
+++ b/user/xset/APKBUILD
@@ -7,13 +7,12 @@ pkgdesc="User preference utility for X11"
 url="https://www.X.Org/"
 arch="all"
 license="X11"
-subpackages="$pkgname-doc"
 depends=""
 makedepends="libx11-dev libxext-dev libxmu-dev util-macros"
+subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xsetroot/APKBUILD b/user/xsetroot/APKBUILD
index d5d6d4d9a4cd8c94c91cb0290d9e8d67459cc51a..e4ad05a2da06774f3faf18672ad7d4efa23ff968 100644
--- a/user/xsetroot/APKBUILD
+++ b/user/xsetroot/APKBUILD
@@ -6,13 +6,12 @@ pkgdesc="Set the root window (desktop background) of an X11 session"
 url="https://www.X.Org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-doc"
 depends=""
 makedepends="libx11-dev libxcursor-dev libxmu-dev util-macros xbitmaps"
+subpackages="$pkgname-doc"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }