diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index c019b92f6b256..eed2f2112b82f 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2014/08/23 07:46:38 obache Exp $
+# $NetBSD: Makefile,v 1.44 2016/01/07 12:05:30 wiz Exp $
 
-DISTNAME=	flex-2.5.39
-PKGREVISION=	2
+DISTNAME=	flex-2.6.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flex/}
 EXTRACT_SUFX=	.tar.xz
@@ -13,7 +12,7 @@ LICENSE=	2-clause-bsd
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gm4:run
+USE_TOOLS+=		gm4:run bison
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 
@@ -32,6 +31,8 @@ LDFLAGS.SCO_SV+=	-lsocket
 
 #.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		bash:build
+REPLACE_BASH=		tests/testwrapper.sh tests/options.cn
 USE_TOOLS+=		gmake	# bmake has problems with the test suite
 #.endif
 
diff --git a/devel/flex/PLIST b/devel/flex/PLIST
index 688ba4458787b..d6e98cf11843f 100644
--- a/devel/flex/PLIST
+++ b/devel/flex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/08/23 03:14:36 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/01/07 12:05:30 wiz Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
@@ -11,7 +11,6 @@ share/doc/flex/COPYING
 share/doc/flex/NEWS
 share/doc/flex/ONEWS
 share/doc/flex/README
-share/doc/flex/TODO
 share/doc/flex/flex.pdf
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index b6e3ac04b85ec..120152d0f26e5 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.20 2015/11/03 03:27:25 agc Exp $
+$NetBSD: distinfo,v 1.21 2016/01/07 12:05:30 wiz Exp $
 
-SHA1 (flex-2.5.39.tar.xz) = 415e82bb0dc9b1713fc4802a9db2274cd8d2909a
-RMD160 (flex-2.5.39.tar.xz) = b5c9555d1fe48086d96475cf41ca800e8138514d
-SHA512 (flex-2.5.39.tar.xz) = 488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
-Size (flex-2.5.39.tar.xz) = 1347436 bytes
-SHA1 (patch-Makefile.am) = 7828c75f891db84b3be1719808b76542a24fdd74
-SHA1 (patch-ab) = 44497cff83005702dfcb36d490746e47757ae299
-SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045
-SHA1 (patch-lib_Makefile.in) = b76d7083939a6e6efd865b45c37023de5058c6f6
+SHA1 (flex-2.6.0.tar.xz) = 684c927c9f1b170e9627338de12e99cf2c224b91
+RMD160 (flex-2.6.0.tar.xz) = 07c8ffa268fc4a9a117e9c12736f8b58a583dde8
+SHA512 (flex-2.6.0.tar.xz) = 9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
+Size (flex-2.6.0.tar.xz) = 1369552 bytes
+SHA1 (patch-src_Makefile.am) = b50c07da46385500c1a220967c84bea1027b4081
+SHA1 (patch-src_Makefile.in) = 8d36fbd12918986715c53c772df549a5057325b7
+SHA1 (patch-src_filter.c) = 377be93afefeca93efa1f8eae0407374bd006ab3
diff --git a/devel/flex/patches/patch-Makefile.am b/devel/flex/patches/patch-Makefile.am
deleted file mode 100644
index 92900d1fdf031..0000000000000
--- a/devel/flex/patches/patch-Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2014/08/23 07:46:38 obache Exp $
-
-* Prevent libfi to be linked with libintl.
-* Avoid -no-undefined flags, or missing symbols might occur.
-
---- Makefile.am.orig	2014-03-26 12:46:44.000000000 +0000
-+++ Makefile.am
-@@ -67,19 +67,19 @@ flex_SOURCES = \
- 	regex.c
- 
- 
--LDADD = lib/libcompat.la
-+LDADD = lib/libcompat.la @LIBINTL@
- 
- libfl_la_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
- 
--libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- 
- libfl_pic_la_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
- 
--libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- 
- noinst_HEADERS = \
- 	flexdef.h \
-@@ -124,7 +124,7 @@ SUBDIRS = \
- 
- localedir = $(datadir)/locale
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- 
- skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
- 	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
deleted file mode 100644
index 2ae00283ad50f..0000000000000
--- a/devel/flex/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2015/04/19 00:05:44 tnn Exp $
-
-* XXX:
-* Prevent libfi to be linked with libintl.
-* Avoid -no-undefined flags, or missing symbols might occur.
-
---- Makefile.in.orig	2014-03-26 18:58:57.000000000 +0000
-+++ Makefile.in
-@@ -304,7 +304,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
-@@ -430,17 +430,17 @@ flex_SOURCES = \
- 	filter.c \
- 	regex.c
- 
--LDADD = lib/libcompat.la
-+LDADD = lib/libcompat.la @LIBINTL@
- libfl_la_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
- 
--libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libfl_pic_la_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
- 
--libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- noinst_HEADERS = \
- 	flexdef.h \
- 	flexint.h \
diff --git a/devel/flex/patches/patch-ad b/devel/flex/patches/patch-ad
deleted file mode 100644
index a09b697165377..0000000000000
--- a/devel/flex/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/01/31 17:10:08 spz Exp $
-
---- filter.c.orig	2007-03-07 21:50:24.000000000 +0000
-+++ filter.c
-@@ -164,7 +164,8 @@ bool filter_apply_chain (struct filter *
- 		if (dup2 (pipes[0], fileno (stdin)) == -1)
- 			flexfatal (_("dup2(pipes[0],0)"));
- 		close (pipes[0]);
--        fseek (stdin, 0, SEEK_CUR);
-+        ungetc(' ', stdin); /* still an evil hack, but one that works better */
-+	(void)fgetc(stdin); /* on NetBSD than the fseek attempt does */
- 
- 		/* run as a filter, either internally or by exec */
- 		if (chain->filter_func) {
diff --git a/devel/flex/patches/patch-lib_Makefile.in b/devel/flex/patches/patch-lib_Makefile.in
deleted file mode 100644
index 1b50b233763b0..0000000000000
--- a/devel/flex/patches/patch-lib_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-lib_Makefile.in,v 1.1 2015/04/19 00:05:44 tnn Exp $
-
-The compat library is linked with libtool so we must use .lo objects
-consistently.
-
---- lib/Makefile.in.orig	2014-03-26 18:58:56.000000000 +0000
-+++ lib/Makefile.in
-@@ -70,7 +70,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libcompat_la_DEPENDENCIES = $(LIBOBJS)
-+libcompat_la_DEPENDENCIES = $(LTLIBOBJS)
- am_libcompat_la_OBJECTS = lib.lo
- libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -244,7 +244,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libcompat.la
- libcompat_la_SOURCES = lib.c
--libcompat_la_LIBADD = $(LIBOBJS)
-+libcompat_la_LIBADD = $(LTLIBOBJS)
- all: all-am
- 
- .SUFFIXES:
diff --git a/devel/flex/patches/patch-src_Makefile.am b/devel/flex/patches/patch-src_Makefile.am
new file mode 100644
index 0000000000000..f5c60d07cc6da
--- /dev/null
+++ b/devel/flex/patches/patch-src_Makefile.am
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2016/01/07 12:05:31 wiz Exp $
+
+libfl* do not need to be linked against libintl, only the binaries do.
+https://sourceforge.net/p/flex/bugs/198/
+
+--- src/Makefile.am.orig	2015-11-13 19:32:53.000000000 +0000
++++ src/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_YFLAGS = -d
+ localedir = $(datadir)/locale
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+ 
+ m4 = @M4@
+ 
+@@ -33,7 +33,7 @@ flex_SOURCES = \
+ 	filter.c \
+ 	regex.c
+ 
+-LDADD = ../lib/libcompat.la
++LDADD = ../lib/libcompat.la @LIBINTL@
+ 
+ libfl_la_SOURCES = \
+ 	libmain.c \
diff --git a/devel/flex/patches/patch-src_Makefile.in b/devel/flex/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000000..e4bcca7e178d3
--- /dev/null
+++ b/devel/flex/patches/patch-src_Makefile.in
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2016/01/07 12:05:31 wiz Exp $
+
+libfl* do not need to be linked against libintl, only the binaries do.
+https://sourceforge.net/p/flex/bugs/198/
+
+--- src/Makefile.in.orig	2015-11-17 16:19:45.000000000 +0000
++++ src/Makefile.in
+@@ -302,7 +302,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+@@ -428,7 +428,7 @@ flex_SOURCES = \
+ 	filter.c \
+ 	regex.c
+ 
+-LDADD = ../lib/libcompat.la
++LDADD = ../lib/libcompat.la @LIBINTL@
+ libfl_la_SOURCES = \
+ 	libmain.c \
+ 	libyywrap.c
diff --git a/devel/flex/patches/patch-src_filter.c b/devel/flex/patches/patch-src_filter.c
new file mode 100644
index 0000000000000..5656c8056865f
--- /dev/null
+++ b/devel/flex/patches/patch-src_filter.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_filter.c,v 1.1 2016/01/07 12:05:31 wiz Exp $
+
+Improve stdin-to-pipe hack on NetBSD
+https://sourceforge.net/p/flex/bugs/198/
+
+--- src/filter.c.orig	2015-11-10 23:10:20.000000000 +0000
++++ src/filter.c
+@@ -174,6 +174,8 @@ clearerr(stdin);
+ 			flexfatal (_("dup2(pipes[0],0)"));
+ 		close (pipes[0]);
+         fseek (stdin, 0, SEEK_CUR);
++        ungetc(' ', stdin); /* still an evil hack, but one that works better */
++        (void)fgetc(stdin); /* on NetBSD than the fseek attempt does */
+ 
+ 		/* run as a filter, either internally or by exec */
+ 		if (chain->filter_func) {