diff -Nru spim-8.0+dfsg/debian/changelog spim-8.0+dfsg/debian/changelog
--- spim-8.0+dfsg/debian/changelog	2013-11-09 18:56:54.000000000 +0000
+++ spim-8.0+dfsg/debian/changelog	2017-04-20 18:48:30.000000000 +0000
@@ -1,3 +1,11 @@
+spim (8.0+dfsg-6.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add patch for flex 2.6 compatibility. (Closes: #860011)
+  * Urgency high for RC bug fix.
+
+ -- Tim Retout <diocles@debian.org>  Thu, 20 Apr 2017 19:48:30 +0100
+
 spim (8.0+dfsg-6) unstable; urgency=low
 
   * acknowledge NMU
diff -Nru spim-8.0+dfsg/debian/patches/flex-2.6-compat spim-8.0+dfsg/debian/patches/flex-2.6-compat
--- spim-8.0+dfsg/debian/patches/flex-2.6-compat	1970-01-01 00:00:00.000000000 +0000
+++ spim-8.0+dfsg/debian/patches/flex-2.6-compat	2017-04-20 18:38:52.000000000 +0000
@@ -0,0 +1,20 @@
+Description: Fix parsing when built with flex 2.6
+Origin: https://sourceforge.net/p/spimsimulator/code/679/
+Bug: https://sourceforge.net/p/spimsimulator/bugs/66/
+Bug-Debian: https://bugs.debian.org/860011
+Last-Update: 2017-04-20
+
+Index: spim-8.0+dfsg/CPU/scanner.l
+===================================================================
+--- spim-8.0+dfsg.orig/CPU/scanner.l
++++ spim-8.0+dfsg/CPU/scanner.l
+@@ -316,7 +316,8 @@ initialize_scanner (FILE *in_file)
+   yyin = in_file;
+ #ifdef FLEX_SCANNER
+   yyrestart(in_file);
+-#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33)
++#define YY_FLEX_VERSION (YY_FLEX_MAJOR_VERSION * 1000 + YY_FLEX_MINOR_VERSION * 100 + YY_FLEX_SUBMINOR_VERSION)
++#if YY_FLEX_VERSION >= 2533
+   /* flex 2.5.33 flipped the polarity of this flag (sigh) */
+   yy_init = 0;
+ #else
diff -Nru spim-8.0+dfsg/debian/patches/series spim-8.0+dfsg/debian/patches/series
--- spim-8.0+dfsg/debian/patches/series	2013-11-08 13:34:19.000000000 +0000
+++ spim-8.0+dfsg/debian/patches/series	2017-04-20 13:01:47.000000000 +0000
@@ -2,3 +2,4 @@
 hyphens
 configure-multiarch
 run-remove-mips.diff
+flex-2.6-compat