diff --git a/lfs/binutils-2.45.PKGBUILD b/lfs/binutils-2.45.PKGBUILD
index 2b528b2..2aeeebc 100644
--- a/lfs/binutils-2.45.PKGBUILD
+++ b/lfs/binutils-2.45.PKGBUILD
@@ -11,10 +11,10 @@ md5sums=("dee5b4267e0305a99a3c9d6131f45759")
 src_prepare() {
   tar -xf ${distdir}/${sources[0]} --strip-components=1
   mkdir -v build
-  cd       build
 }
 
 src_build() {
+  pushd build
   ../configure --prefix=/usr                           \
                --sysconfdir="${pkgdir}"/etc            \
                --enable-gold                           \
@@ -27,17 +27,25 @@ src_build() {
                --with-system-zlib                      \
                --enable-default-hash-style=gnu
   make tooldir=/usr
+  popd
 }
 
 src_check() {
+  pushd build
   make -k CFLAGS_FOR_TARGET="-O2 -g" \
     CXXFLAGS="-O2 -no-pie -fno-PIC" \
     CFLAGS="-O2 -no-pie" \
     LDFLAGS="" \
     check
+  popd
 }
 
 src_install() {
+  pushd build
   make prefix="${pkgdir}"/usr tooldir="${pkgdir}"/usr install
   rm -fv "${pkgdir}"/usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a
+  find "${pkgdir}" -type f -name "*.a" -delete
+  popd
 }
+
+# vim:ft=sh syn=sh et sw=2: