diff --git a/games-puzzle/amoebax/additional-files/amoebax.rdef b/games-puzzle/amoebax/additional-files/amoebax.rdef
index b8676e0f6..5dcb51c65 100644
--- a/games-puzzle/amoebax/additional-files/amoebax.rdef
+++ b/games-puzzle/amoebax/additional-files/amoebax.rdef
@@ -12,3 +12,113 @@ resource app_version {
 };
 
 resource app_signature "application/x-vnd.amoebax";
+
+resource vector_icon {
+	$"6E636966050333A02C0324711F05FF050004FFA310060DEEFFFF03B636B850BF"
+	$"77B3E4B796B3E2C7E0B3E5C925B8D6CA1ABCD7CA31BB73CA03BE3BCB98BF0DCB"
+	$"B3BD93CB7CC086C957C507CA4CC415C862C5FAC8D4C9EDC84BC8DFC95CCAFAC9"
+	$"0ACB9ACA6CCB7FC7A85EBF25CA95C250CA95BC44CA95B4BFCA8CB3E5CBEAB599"
+	$"C92EB5FFC854B5FFC94DB5FFC72CB570C329B613C3CBB4CDC287B442BCD7B332"
+	$"BF28B553BA860623FEF6FFFFFFFFFFBF2FB712B893B711B895B711B895B71EB8"
+	$"6DBF77B4C8B86DB4C7C6FFB4C9C846B911C83AB8E4C846B911C83FB8D6B902C8"
+	$"4FB92BC84FB92BC8AFBA1BC934BCC8C942BBEBC91FBE0FCA70BEB4CA02BE7ECA"
+	$"87BEBFCAB4BEDACAABBED1CAB2BED9CAB0BED4CAB1BED6CAB0BED4CAB2BEFCCA"
+	$"B4BEDFCA98C05CC8B4C466C972C3A9C766C5B0C805CA53C75BC901C83ACABBC8"
+	$"ADCB4DC87CCB0FC8BFCB64C8DFCB90C8D9CB85C8D6CB81C8E0CB0BC8C6CB4BC8"
+	$"F9CACDC93ACAADC92BCAB2C939CAADC8F8CAB6C929CAB2C872CAC0C573CA5352"
+	$"CA89C357CA07BF25C9B0C0F3C9B0BE36C9B0BB3FC9F5BCC6C9D2B941CA23B548"
+	$"CA2BB5EACA70B554CA31B58ECA85B57CCA4DB59FCABAB584CB04B593CAEBB5CD"
+	$"CA8DB637CA10B608CA48B691C9A6B6E6C854B6E6C941B6E6C854B6E6C7FBB6E6"
+	$"C7FBB6EAC4FDB613C288B6C9C33CB596C20CB514BD35B43ABF12B5A2BC00B677"
+	$"BA0DB624BAD3B677BA0DB6E4B907B701B8BEB701B8BEB702B8BBB704B8B6B702"
+	$"B8B8B704B8B6B70CB8A5021AB371BC78B47BBA34B224BF4CB4CDC3CAB40BC30B"
+	$"B4C7C3C4B4C4C3C0B4C4C3C0B4EDC401B519C7F8B51DC4F1B519C7F8B518C854"
+	$"B518C854B518C89CB4D5C8EBB518C89CB49FC92BB3FBCA14B456C981B3BBCA7A"
+	$"B3F45DB3B9CAF0B486CC38BB69CBBBB60ECC37BCE5CB99BF25CB79BE4BCB79C0"
+	$"D2CB79C532CC17C325CBCDC72CCC5FC91CCC7DC86CCC8AC972CC76CA88CBBFCA"
+	$"3CCC67CAD0CB1ECA19CA35CA66CA97C9F0CA01C9A2C987C9C2C9C6C939C8B7C9"
+	$"FAC5A9C95CC645CB2EC478CC7EBF1DCC62C097CC97BDC5CB3CBD1BCBADBD52CB"
+	$"26BD10CAFBBCF7CB03BCFFCAFDBCF9CB01BD02CB00BCFFCB01BD02CB00BCE5CA"
+	$"FFBCFACB1ABB59C9FCB882CA19B8CCC9FCB882CA05B89ECA05B89EC9F6B864BF"
+	$"7720C879B301B705B2FEB559B80DB56AB7D8B559B80DB55FB7FCB55FB7FCB55D"
+	$"B801020CB77DC154B77DC154B7F4C165B8E8C16BB864C192B92AC157B9CBC134"
+	$"B96CC144BA0DC120BA98C0DCBA4FC10DBAC3C0A8BB4DC063BB05C094BD75BED7"
+	$"BC29BA19BDC8BBE4BBF4B9F6BB7CB9E8BBB8B9EFB9C1B895B554BA16B71BB89F"
+	$"B52ABA4AB4DBBA96B505BA62B423BB9BB3F6BDEAB3BFBCC7B407BE25B423BEB8"
+	$"B418BE61B488C01DB77DC154B601C100B77DC1540623FFBEFFFEFEFBFBBE2FB7"
+	$"60C215B760C215B778C218B7ADC223B792C21EB811C238B921C226B88EC252B9"
+	$"62C213B9EBC1F5B999C203B9EBC1F5B9F8C1F3BA05C1EFBA05C1EFBA4CC1DABB"
+	$"06C17FBAA5C1C0BB06C17FBB1FC16EBB32C157BB32C157BB3144BB3144BB3144"
+	$"BB37C152BB63C13ABB50C144BB7CC12CBBBCC105BB9BC11BBBBCC105BBBFC103"
+	$"BBC1C101BBC1C101BCFAC021BDEDBD55BDC5BECABE13BBF4BCBCB996BDA4BA97"
+	$"BCBCB996BCACB984BC97B976BC97B976BC3AB939BB93B926BBD9B92EBB93B926"
+	$"BBF5B94DBBF5B94DB9EDB7BFB4D6B980B6DDB7D4B4D6B980B4C7B98CB4BBB99B"
+	$"B4BBB99BB4ADB9ACB48EB9CAB49FB9B9B479B9DEB442BA1AB45EB9F7B442BA1A"
+	$"B43DBA20B438BA26B438BA26B351BB70B334BE0EB2F7BCCAB334BE0EB336BE17"
+	$"B338BE20B338BE20B348BE57B35FBECFB356BE87B35FBECFB361BEDEB365BEED"
+	$"B365BEEDB3E7C0B8B752C212B5C1C1BAB752C212B759C214021AB7A8C095B7A8"
+	$"C095B687C055B4E1BE83B534BFA8B4E1BE83B4E7BEA0B4E7BEA0B4DBBE3AB4B5"
+	$"BDB5B4C6BDF3B4B5BDB5B4B9BDC6B4B9BDC6B484BCB2B57DBB05B506BBAEB57D"
+	$"BB05B574BB11B574BB11B582BB00B5A1BAE3B58FBAF3B5B6BACEB5ED33B5D1BA"
+	$"B5B5ED33B5D3BAADB5D3BAADB74FB974BB03BA83B98AB962BB03BA83BB2FBAA4"
+	$"BB2FBAA4BB2FBAA4BB66BAAABB66BAAABB89BAAEBBBBBABBBBAEBAB3BBBBBABB"
+	$"BB96BA9BBB96BA9BBC33BB49BC64BD2CBC7EBC38BC48BE33BAD9BFC5BBB8BF25"
+	$"BAD9BFC5BADFBFC1BADFBFC1BACCBFCDBAA4BFE4BAB9BFD8BA71BFFFB9FEC062"
+	$"BA32C022B9FEC062BA2AC03ABA2AC03AB9F9C05AB992C079B9CCC068B992C079"
+	$"B9ABC073B9ABC073B940C085B8B1C0AFB8F4C09BB87FC0BEB7FEC0A5B84FC0B5"
+	$"B7DEC09EB79AC092B7BDC097B79AC092020CB77DC154B77DC154B7F4C165B8E8"
+	$"C16BB864C192B92AC157B9CBC134B96CC144BA0DC120BA98C0DCBA4FC10DBAC3"
+	$"C0A8BB4DC063BB05C094BD75BED7BC29BA19BDC8BBE4BBF4B9F6BB7CB9E8BBB8"
+	$"B9EFB9C1B895B554BA16B71BB89FB52ABA4AB4DBBA96B505BA62B423BB9BB3F6"
+	$"BDEAB3BFBCC7B407BE25B423BEB8B418BE61B488C01DB77DC154B601C100B77D"
+	$"C154020CB638BF4FB638BF4FB651BF53B685BF54B669BF5CB692BF50B6B5BF49"
+	$"B6A0BF4CB6C3BF44B6E0BF36B6D0BF40B6E9BF2BB706BF1CB6F7BF27B77BBEC9"
+	$"B735BDC8B78CBE29B729BDC1B710BDBEB71DBDBFB6B2BD76B5C3BDC8B623BD78"
+	$"B5BABDD2B5A9BDE2B5B2BDD7B583BE1AB579BE97B56DBE59B57DBEA3B583BEC2"
+	$"B580BEB0B598BF0EB638BF4FB5E8BF3DB638BF4F020CC7D7C154C7D7C154C760"
+	$"C165C66CC16BC6F0C192C62AC157C588C134C5E8C144C546C120C4BCC0DCC504"
+	$"C10DC491C0A8C406C063C44FC094C1DEBED7C32BBA19C18BBBE4C360B9F6C3D8"
+	$"B9E8C39CB9EFC593B895C9FFBA16C838B89FCA2ABA4ACA79BA96CA4EBA62CB30"
+	$"BB9BCB5DBDEACB94BCC7CB4CBE25CB31BEB8CB3BBE61CACBC01DC7D7C154C952"
+	$"C100C7D7C154021AC7BAC092C7BAC092C796C097C756C0A5C775C09EC705C0B5"
+	$"C6A5C0B0C6D5C0BEC660C09BC5A8C073C614C085C5A8C073C5C1C079C5C1C079"
+	$"C588C068C52AC03AC55AC05AC52AC03AC556C061C556C061C522C022C4B0BFE4"
+	$"C4E3BFFFC49BBFD8C475BFC1C487BFCDC475BFC1C47ABFC5C47ABFC5C39CBF25"
+	$"48BD2BC30CBE33C2D5BC38C3BEBA9BC321BB49C3BEBA9BC399BABBC399BABBC3"
+	$"A6BAB2C3EEBAAAC3CBBAAEC3EEBAAAC425BAA4C425BAA4C425BAA4C450BA83C4"
+	$"50BA83C5CAB961C981BAACC805B974C981BAACC96633C96633C983BAB4C9B3BA"
+	$"E2C99DBACEC9C4BAF3C9E0BB11C9D2BB00C9E0BB11C9D7BB05C9D7BB05CA4DBB"
+	$"AECA9BBDC6CACFBCB1CA9BBDC6CA9FBDB5CA9FBDB5CA8DBDF3CA6DBEA0CA79BE"
+	$"3ACA6DBEA0CA72BE83CA72BE83CA1FBFA8C7ACC094C8CDC055C7ACC0940623EF"
+	$"FBFEFEFBFBEFFB2FC802C212C802C212C992C1BACBEFBEEDCB6DC0B8CBEFBEED"
+	$"CBF3BEDECBF5BECFCBF5BECFCBFEBE87CC1BBE1FCC0BBE57CC1BBE1FCC1EBE17"
+	$"CC1FBE0ECC1FBE0ECC5DBCCACB1BBA26CC03BB70CB1BBA26CB17BA20CB12BA1A"
+	$"CB12BA1ACAF6B9F7CAC6B9CACADBB9DECAB4B9B9CA99B99BCAA7B9ACCA99B99B"
+	$"CA8DB98CCA7EB980CA7EB980C877B7D4C35FB94DC567B7BFC35FB94DC3C1B926"
+	$"C3C1B926C37AB92EC2BDB976C31AB939C2BDB976C2A8B984C298B996C298B996"
+	$"C1B0BA97C167BD55C140BBF4C18FBECAC392C101C25AC021C392C101C395C103"
+	$"C398C105C398C105C3B9C11BC3F1C13AC3D8C12CC403C144C42344C41DC152C4"
+	$"23444BC1574B444BC157C435C16EC44DC17FC44DC17FC4AFC1BFC54FC1EFC508"
+	$"C1DAC54FC1EFC55BC1F3C568C1F5C568C1F54FC202C631C226C5F1C213C6C6C2"
+	$"52C7A7C223C743C238C7C2C21EC7F3C215C7DCC218C7F3C215C7FAC214020CC7"
+	$"D7C154C7D7C154C760C165C66CC16BC6F0C192C62AC157C588C134C5E8C144C5"
+	$"46C120C4BCC0DCC504C10DC491C0A8C406C063C44FC094C1DEBED7C32BBA19C1"
+	$"8BBBE4C360B9F6C3D8B9E8C39CB9EFC593B895C9FFBA16C838B89FCA2ABA4ACA"
+	$"79BA96CA4EBA62CB30BB9BCB5DBDEACB94BCC7CB4CBE25CB31BEB8CB3BBE61CA"
+	$"CBC01DC7D7C154C952C100C7D7C154020CC88DBC0AC88DBC0AC874BC0EC840BC"
+	$"0FC85CBC18C832BC0BC810BC04C825BC07C802BC00C7E5BBF1C7F4BBFBC7DCBB"
+	$"E6C7BFBBD8C7CEBBE2C74ABB84C790BA83C738BAE4C79BBA7CC7B5BA79C7A8BA"
+	$"7AC812BA31C902BA83C8A2BA33C90BBA8EC91CBA9EC913BA93C942BAD5C94CBB"
+	$"52C957BB14C94835C942BB7DC945BB6BC92DBBC9C88DBC0AC8DDBBF9C88DBC0A"
+	$"0208BCFABC4FBB07C182BD60BB3FBCAFBF34BD77BE2FBC77BF78BBD8C05ABBF2"
+	$"C01BBBA1C09DBAE1C0E1BB1BC0BBBA8AC10CBA18C157BA51C131B9A5C1A2B8B6"
+	$"C1A8B92CC197B732C1C4B4BDC01EB586C157B499BFCEB456BF66B478BF9AB456"
+	$"BF660208CAF9BED3C694C245CBDFBE1EC934C126CA68C0AEC8E1C143C7E3C1B3"
+	$"C81AC18AC790C1CFC6C8C1A8C70DC1A5C668C19FC5DEC1A4C623C1A2C555C1AA"
+	$"C485C134C4F4C162C32BC085C1EFBDD9C1F7BF4CC1FABD82C1F7BD07C1F9BD45"
+	$"C1F7BD070204BF7FB5D4BE11B5D4C0EDB5D4C20CB705C20CB65AC20CB7AFBF7F"
+	$"B835C0EDB835BE11B835BCF2B705BCF2B7AFBCF2B65A0D0A000100000A010201"
+	$"02000A000103000A00020405000A020106000A030107000A000108000A000209"
+	$"0A000A02010B000A03010C000A01010D000A01010E000A04010F00"
+};
+
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.recipe b/games-puzzle/amoebax/amoebax-0.2.1.recipe
index 2e103d07b..e90b45f32 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1.recipe
+++ b/games-puzzle/amoebax/amoebax-0.2.1.recipe
@@ -9,9 +9,10 @@ COPYRIGHT="2006-2007 Jordi Fita (Code), Safareig Creatiu (Graphics), Àlex \
 Almarza (Music & Sound), Ferran Brugat (Web Page)"
 LICENSE="GNU GPL v2
     LALv1.2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://www.emma-soft.com/games/amoebax/download/amoebax-$portVersion.tar.bz2"
 CHECKSUM_SHA256="709c7e657b328a6f7d331298c6264f172528489d28cab107c40c483c392340b2"
+PATCHES="amoebax-$portVersion.patchset"
 ADDITIONAL_FILES="amoebax.rdef"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -23,16 +24,16 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
-	lib:libsdl_image$secondaryArchSuffix
-	lib:libsdl_mixer$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libSDL_image_1.2$secondaryArchSuffix
+	lib:libSDL_mixer_1.2$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libsdl$secondaryArchSuffix
-	devel:libsdl_image$secondaryArchSuffix
-	devel:libsdl_mixer$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libSDL_image$secondaryArchSuffix
+	devel:libSDL_mixer$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -43,14 +44,16 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize -fci
-	configure --prefix=$appsDir/AmoeBax
+	runConfigure --omit-dirs binDir \
+		./configure --bindir=$appsDir \
+		--disable-dependency-tracking
 }
 
 INSTALL()
 {
 	make install
-	mv $appsDir/AmoeBax/bin/amoebax $appsDir/AmoeBax/AmoeBax
-	rm -r $appsDir/AmoeBax/bin
+	mv $appsDir/amoebax $appsDir/AmoeBax
+	rm -rf $dataDir/{applications,pixmaps}
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -62,7 +65,7 @@ INSTALL()
 		$portDir/additional-files/amoebax.rdef > amoebax.rdef
 
 	addResourcesToBinaries amoebax.rdef \
-		$appsDir/AmoeBax/AmoeBax
+		$appsDir/AmoeBax
 
-	addAppDeskbarSymlink $appsDir/AmoeBax/AmoeBax
+	addAppDeskbarSymlink $appsDir/AmoeBax
 }
diff --git a/games-puzzle/amoebax/patches/amoebax-0.2.1.patchset b/games-puzzle/amoebax/patches/amoebax-0.2.1.patchset
new file mode 100644
index 000000000..b61365391
--- /dev/null
+++ b/games-puzzle/amoebax/patches/amoebax-0.2.1.patchset
@@ -0,0 +1,22 @@
+From d9a6e7af27e3438a4f8cca5536c9f0818c67842d Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 25 Aug 2019 09:08:41 +0200
+Subject: Fix path for options.conf
+
+
+diff --git a/src/UnixOptions.cxx b/src/UnixOptions.cxx
+index 0ffa7ac..b2525e2 100644
+--- a/src/UnixOptions.cxx
++++ b/src/UnixOptions.cxx
+@@ -130,7 +130,7 @@ UnixOptions::getOptionsDirectory (void)
+     if ( 0 == configDirectory.length () )
+     {
+         configDirectory += getenv ("HOME");
+-        configDirectory += "/.config";
++        configDirectory += "/config/settings";
+     }
+     configDirectory += "/amoebax";
+     makeDirectory (configDirectory);
+-- 
+2.21.0
+