diff --git a/graphics/fim/fim.SlackBuild b/graphics/fim/fim.SlackBuild
index c2ae121b29..1416014e31 100644
--- a/graphics/fim/fim.SlackBuild
+++ b/graphics/fim/fim.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fim
-VERSION=${VERSION:-0.5_rc1}
+VERSION=${VERSION:-0.6_trunk}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -71,6 +71,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Workaround for gcc 10 (hanks garron@AUR)
+sed -i -e 's/#define FIM_WANT_BACKGROUND_LOAD.*//' src/fim.h
+sed -i -e 's/void exit/FIM_NORETURN void exit/' src/CommandConsole.h
+sed -i -e 's/°//g' src/fim.cpp
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -82,14 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
   --disable-debug \
-  --with-default-consolefont=/usr/share/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz \
+  --enable-hardcoded-font \
+  --enable-sdl \
+  --enable-unicode \
   --build=$ARCH-slackware-linux
 
-# Fix build with bison-3
-sed -i \
-  -e '/^fim_LDADD = /s/ \$(LEXLIB)//' \
-  src/Makefile
-
 make -j1
 make install DESTDIR=$PKG
 
diff --git a/graphics/fim/fim.info b/graphics/fim/fim.info
index c2c082121b..25e19a7188 100644
--- a/graphics/fim/fim.info
+++ b/graphics/fim/fim.info
@@ -1,8 +1,8 @@
 PRGNAM="fim"
-VERSION="0.5_rc1"
+VERSION="0.6_trunk"
 HOMEPAGE="http://www.nongnu.org/fbi-improved/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/fbi-improved/fim-0.5-rc1.tar.gz"
-MD5SUM="03d4dd36c894c1d319b5d5ca7a82dfb3"
+DOWNLOAD="http://download.savannah.nongnu.org/releases/fbi-improved/fim-0.6-trunk.tar.gz"
+MD5SUM="96492d5c53f806ebdf6d624e73360bdd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""