diff --git a/app-arch/exomizer/exomizer-2.0.9.recipe b/app-arch/exomizer/exomizer-3.1.1.recipe
similarity index 75%
rename from app-arch/exomizer/exomizer-2.0.9.recipe
rename to app-arch/exomizer/exomizer-3.1.1.recipe
index 7f144e1d3..66cb79133 100644
--- a/app-arch/exomizer/exomizer-2.0.9.recipe
+++ b/app-arch/exomizer/exomizer-3.1.1.recipe
@@ -23,35 +23,33 @@ following features:
 * It can produce files for both \"in memory\" and \"from disk\" decrunching.
 * It handles RLE-sequences well, no packer is necessary.
 * It is able to link/combine more than one source file into the same crunched target file."
-HOMEPAGE="http://hem.bredband.net/magli143/exo/"
-COPYRIGHT="2002-2013 Magnus Lind"
+HOMEPAGE="https://bitbucket.org/magli143/exomizer/wiki/Home"
+COPYRIGHT="2002-2021 Magnus Lind"
 LICENSE="Zlib"
 REVISION="1"
-SOURCE_URI="http://hem.bredband.net/magli143/exo/exomizer209.zip"
-CHECKSUM_SHA256="d2a95d4d168e4007fc396295e2f30a21b58f4648c28d1aadf84e7d497c5c7a34"
+SOURCE_URI="https://bitbucket.org/magli143/exomizer/wiki/downloads/exomizer-$portVersion.zip"
+CHECKSUM_SHA256="2dfc821220d90185e31b5fe0958682e498e1bd8aaca7fe1b122febb863e9fe2d"
 SOURCE_DIR="src"
-PATCHES="exomizer-2.0.7.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	exomizer = $portVersion
-	cmd:b2membuf
+	exomizer$secondaryArchSuffix = $portVersion
 	cmd:exobasic
 	cmd:exomizer
-	cmd:exoraw
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:flex
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -62,6 +60,6 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $binDir
-	cp b2membuf exobasic exomizer exoraw $binDir
+	mkdir -p $prefix/bin
+	cp exobasic exomizer $prefix/bin
 }
diff --git a/app-arch/exomizer/patches/exomizer-2.0.7.patchset b/app-arch/exomizer/patches/exomizer-2.0.7.patchset
deleted file mode 100644
index ef78dfcb7..000000000
--- a/app-arch/exomizer/patches/exomizer-2.0.7.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 85cd06b9f153fa8b77e82d20cd561f0ac9bbba4c Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Sat, 25 Jul 2015 09:14:21 +0200
-Subject: gcc2 fix.
-
-
-diff --git a/Makefile b/Makefile
-index 92fd825..2cc78d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- # Makefile for exomizer
- #
- WFLAGS = -Wall -Wstrict-prototypes
--CFLAGS = $(WFLAGS) -O3 -ffast-math -mtune=i686 -fomit-frame-pointer -fgcse -pedantic
-+CFLAGS = $(WFLAGS) -O3 -ffast-math -march=i686 -fomit-frame-pointer -fgcse -pedantic
- LDFLAGS = -s
- 
- #CFLAGS = -g -mtune=i686 $(WFLAGS)
--- 
-2.2.2
-