diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template
index 2b7d2f5cbb..81ea0b33ad 100644
--- a/srcpkgs/flex/template
+++ b/srcpkgs/flex/template
@@ -1,6 +1,6 @@
 # Template file for 'flex'
 pkgname=flex
-version=2.6.0
+version=2.6.1
 revision=1
 build_style=gnu-configure
 # YES REALLY! WE DONT WANT BINS LINKED TO LIBFL!
@@ -12,12 +12,17 @@ short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://flex.sourceforge.net"
 license="BSD"
-distfiles="${SOURCEFORGE_SITE}/flex/${pkgname}-${version}.tar.bz2"
-checksum=24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9
+distfiles="https://github.com/westes/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
 
-pre_install() {
-	sed -i "s|.SUFFIXES: .dvi .html .info .pdf .ps .texi|.SUFFIXES: .info .texi|g" doc/Makefile
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" flex"
+	post_configure() {
+		# Use host flex
+		sed -i 's,$(top_builddir)/src/stage1flex$(EXEEXT),flex,' \
+			src/Makefile
+	}
+fi
 post_install() {
 	vlicense COPYING
 }