diff --git a/media-gfx/flameshot/additional-files/flameshot.png b/media-gfx/flameshot/additional-files/flameshot.png
new file mode 100644
index 000000000..30efb8d4d
Binary files /dev/null and b/media-gfx/flameshot/additional-files/flameshot.png differ
diff --git a/media-gfx/flameshot/additional-files/flameshot.rdef.in b/media-gfx/flameshot/additional-files/flameshot.rdef.in
new file mode 100644
index 000000000..e02461fad
--- /dev/null
+++ b/media-gfx/flameshot/additional-files/flameshot.rdef.in
@@ -0,0 +1,30 @@
+
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "Flameshot",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E63696603020106033D7FD10000000000003E083B4AAA9A4888BD00FFD2679B"
+	$"FFA837FFFF6406050004017202061CFEBEFBAAAAAAEEC22BB468C306BB35C351"
+	$"B97EC2BBBCE4C031BFADC1CEBF06BFB1BFE1BD95BE34BE25BED9BD04BD90BCA1"
+	$"BBC2BC6FBED9BC45BD55BC9AC05EBD3EC3C2BD4BC297BD2FC504BC53C666BB46"
+	$"C3F2BBCBC4EDBAC2C2F6B962C1A3BA1FC4C8BA19C343BA26C64DBA32CDB0B769"
+	$"C983BD03D1E9C13AD16BC241D10ABE51CF1CC365CCA0BE51CA23C365C7A6C879"
+	$"CA23CCE5C7F8CCC6C744C879C529CC37C354CC11C218CB72BD8BC9F2BF97CABC"
+	$"BF0FC96DBFF1C826C011C6B6BA64C773BC55C565B6EC0A05C879CA23C365CCA0"
+	$"C80FCEE8C9E6CE3BCBF5CBD8030A02020001023F99C60000000000003C11E043"
+	$"7D124AA9EA0A01020001123F338C0000000000003F1F17C305DB3F1AE1011785"
+	$"00040A00020001023F338C0000000000003F1F17C305DB3F1AE1"
+};
diff --git a/media-gfx/flameshot/flameshot-0.6.0.recipe b/media-gfx/flameshot/flameshot-0.6.0.recipe
index 9eb424453..63bacf79b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.recipe
+++ b/media-gfx/flameshot/flameshot-0.6.0.recipe
@@ -9,38 +9,48 @@ DESCRIPTION="Features
 HOMEPAGE="https://github.com/lupoDharkael/flameshot/"
 COPYRIGHT="2019 lupoDharkael"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/lupoDharkael/flameshot/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="61b3a1969d6e17d80d5d90a3fce53ca5ae78fa21f9a45e5a19b0b32ea815a589"
-#ADDITIONAL_FILES="flameshot.rdef"
+PATCHES="flameshot-$portVersion.patchset"
+ADDITIONAL_FILES="
+	flameshot.rdef.in
+	flameshot.png
+	"
 
-ARCHITECTURES="x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	flameshot = $portVersion
-	app:Flameshot = $portVersion
+	flameshot$secondaryArchSuffix = $portVersion
+	app:Flameshot$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libGL
-	lib:libQt5Core
-	lib:libQt5DBus
-	lib:libQt5Gui
-	lib:libQt5Network
-	lib:libQt5Svg
-	lib:libQt5Widgets
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Svg$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:lrelease >= 5
+	cmd:gcc$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
-	cmd:qmake >= 5
+	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
+PATCH()
+{
+	cp -f $sourceDir/../../additional-files/flameshot.png $sourceDir/img/app/flameshot.png
+}
+
 BUILD()
 {
 	qmake PREFIX=$appsDir/Flameshot
@@ -60,5 +70,20 @@ INSTALL()
 	rm -rf $appsDir/Flameshot/bin
 	rm -rf $appsDir/Flameshot/share
 
+	local APP_SIGNATURE="application/x-vnd.flameshot"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/flameshot.rdef.in > flameshot.rdef
+
+	addResourcesToBinaries flameshot.rdef $appsDir/Flameshot/Flameshot
+
 	addAppDeskbarSymlink $appsDir/Flameshot/Flameshot
 }
diff --git a/media-gfx/flameshot/patches/flameshot-0.6.0.patchset b/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
index 141eebd8d..7f55e151e 100644
--- a/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
+++ b/media-gfx/flameshot/patches/flameshot-0.6.0.patchset
@@ -1,48 +1,23 @@
-From f8c5ab33bc23c2b6b947f45e939006466d272e8a Mon Sep 17 00:00:00 2001
-From: kikadf <kikadf.01@gmail.com>
-Date: Tue, 20 Aug 2019 17:29:57 +0200
-Subject: Enable hungarian translation
+From 99407a848b8164d7400aa8ff297d8c7d4476b51e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 21 Aug 2019 21:38:36 +1000
+Subject: Fix crush
 
 
-diff --git a/flameshot.pro b/flameshot.pro
-index 7485ab8..a3d789c 100644
---- a/flameshot.pro
-+++ b/flameshot.pro
-@@ -43,6 +43,7 @@ TRANSLATIONS = translations/Internationalization_es.ts \
-     translations/Internationalization_tr.ts \
-     translations/Internationalization_ka.ts \
-     translations/Internationalization_fr.ts \
-+    translations/Internationalization_hu.ts \
-     translations/Internationalization_pl.ts
+diff --git a/src/utils/filenamehandler.cpp b/src/utils/filenamehandler.cpp
+index d31bcfd..ae1f03e 100644
+--- a/src/utils/filenamehandler.cpp
++++ b/src/utils/filenamehandler.cpp
+@@ -23,7 +23,9 @@
+ #include <QDir>
  
- # Generate translations in build
--- 
-2.23.0
-
-
-From 753f29334f79c63f9b17c8b1d28c3dce91bf38f6 Mon Sep 17 00:00:00 2001
-From: kikadf <kikadf.01@gmail.com>
-Date: Tue, 20 Aug 2019 17:32:30 +0200
-Subject: Fix: LC_ALL not defined on Haiku, cause crash when config menu
- selected
-
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 83fa1c1..edebc8c 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -37,6 +37,11 @@
- #endif
- 
- int main(int argc, char *argv[]) {
-+#if defined(__HAIKU__)
-+	/*LC_ALL not defined on Haiku*/
-+	setenv("LC_ALL","C",1);
+ FileNameHandler::FileNameHandler(QObject *parent) : QObject(parent) {
++#ifndef __HAIKU__
+     std::locale::global(std::locale(""));
 +#endif
-+
-     // required for the button serialization
-     // TODO: change to QVector in v1.0
-     qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
+ }
+ 
+ QString FileNameHandler::parsedPattern() {
 -- 
 2.23.0