diff --git a/flex/PKGBUILD b/flex/PKGBUILD
index dadedf3181..e9ed5d472a 100644
--- a/flex/PKGBUILD
+++ b/flex/PKGBUILD
@@ -5,41 +5,38 @@
 
 pkgname=flex
 pkgver=2.6.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A tool for generating text-scanning programs"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://github.com/westes/flex"
 license=('custom')
-groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
 makedepends=('help2man')
-# enable staticlibs for Talos/Blackbird FW to be able to build
-options=('staticlibs')
-source=("https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"{,.sig}
-        "flex-pie.patch")
-md5sums=('2882e3179748cc9f9c23ec593d6adc8d'
-         'SKIP'
-         '0a8e8242b37c57b0bc0c6f673bceb5b7')
+source=(
+  "https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"{,.sig}
+  "flex-pie.patch"
+)
+sha256sums=('e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995'
+            'SKIP'
+            '20f3cce6b0ea6ab67a902a46b89c292b959994dedcbe6ee5d187f9bba1408b0e')
 validpgpkeys=('56C67868E93390AA1039AD1CE4B29C8D64885307') # Will Estes
 
 prepare() {
   cd "$pkgname-$pkgver"
   patch -p1 -i "$srcdir"/flex-pie.patch
-  autoreconf
+  autoreconf -fiv
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-static \
-              --build=${CHOST}
+  ./configure --prefix=/usr --build=${CHOST}
+  # prevent excessive overlinking due to libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd "$pkgname-$pkgver"
-
-  # cxx_restart fails - https://github.com/westes/flex/issues/98
-  make -k check || true
+  make -k check -C $pkgname-$pkgver
 }
 
 package() {