diff --git a/fcode-utils/PKGBUILD b/fcode-utils/PKGBUILD
index 64d6600e..fb4d7530 100644
--- a/fcode-utils/PKGBUILD
+++ b/fcode-utils/PKGBUILD
@@ -12,7 +12,7 @@ makedepends=('unzip' 'make')
 source=("${pkgname}-${pkgver}.zip"::"http://tracker.coreboot.org/trac/openbios/changeset/197/fcode-utils?old_path=%2F&old=197&format=zip")
 sha256sums=('SKIP')
 
-noextract=${pkgname}-${pkgver}.zip
+noextract=(${pkgname}-${pkgver}.zip)
 
 prepare() {
   cd $srcdir
@@ -20,16 +20,16 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/${pkgname}
+  cd $srcdir/${pkgname}-${pkgver}
   make -j1
 }
 
 package() {
-  cd $srcdir/${pkgname}
+  cd $srcdir/${pkgname}-${pkgver}
   mkdir -p ${pkgdir}/usr/bin
 
-  cp -rf ${srcdir}/${pkgname}/toke/toke.exe ${pkgdir}/usr/bin/
-  cp -rf ${srcdir}/${pkgname}/detok/detok.exe ${pkgdir}/usr/bin/
-  cp -rf ${srcdir}/${pkgname}/romheaders/romheaders.exe ${pkgdir}/usr/bin/
+  cp -rf ${srcdir}/${pkgname}-${pkgver}/toke/toke.exe ${pkgdir}/usr/bin/
+  cp -rf ${srcdir}/${pkgname}-${pkgver}/detok/detok.exe ${pkgdir}/usr/bin/
+  cp -rf ${srcdir}/${pkgname}-${pkgver}/romheaders/romheaders.exe ${pkgdir}/usr/bin/
 }