diff --git a/app-emulation/qemu/additional-files/qemu.iom b/app-emulation/qemu/additional-files/qemu.iom
index d1c619465..6383fd070 100644
Binary files a/app-emulation/qemu/additional-files/qemu.iom and b/app-emulation/qemu/additional-files/qemu.iom differ
diff --git a/app-emulation/qemu/additional-files/qemu.rdef.in b/app-emulation/qemu/additional-files/qemu.rdef.in
index 8eeed1a79..9390323ba 100644
--- a/app-emulation/qemu/additional-files/qemu.rdef.in
+++ b/app-emulation/qemu/additional-files/qemu.rdef.in
@@ -16,173 +16,102 @@ resource app_version {
 resource app_signature "@APP_SIGNATURE@";
 
 resource vector_icon {
-	$"6E63696607020016023948D63D3094BDDFAB39FD1F4ABA27497CCF00FFFF1002"
-	$"010602374523320A99B7657F3CB86948145E49514700F3C7B8FFD5613803D5AD"
-	$"A105FF05A1050104017B1C0210B9C1B589B9C1B5A0B9CCB5A2B9E8B5CFB9DAB5"
-	$"B8B9EEB5E2B9F4B608B9F1B5F5B9FBB5F5BA0DB5D0BA03B5E2BA1AB5BDBA22B5"
-	$"8FBA22B5A7BA25B5A8BA34B5D8BA2EB5C0BA35B5EABA32B60FBA33B5FDBA3FB5"
-	$"FFBA5AB5E1BA4BB5EFBA6BB5D2BA88B5B0BA7CB5C3BA80B5C6BA80B5F5BA7BB5"
-	$"DDBA6EB61ABA43B65FBA57B63BBA1EB66BB9D0B661B9F6B65FB9C0B664B9AAB6"
-	$"4DB9B3B659B9ADB644B9B2B632B9B0B63BB9B6B621B9B8B5FEB9B7B610B9B8B5"
-	$"EEB9BBB5CEB9B9B5DEB9BEB5B7020DB8A0B651B89AB652B8A1B637B8A5B603B8"
-	$"A2B61DB8AAB612B8B5B631B8B0B622B8BDB648B8C9B677B8C3B660B8C9B677B8"
-	$"CAB67DB8CAB67DB8CDB684B8D4B692B8D0B68BB8BBB6A2B884B6AFB89EB6A5B8"
-	$"7EB6B2B874B6B9B879B6B6B874B6ABB86CB68EB875B69BB85CB676B83FB643B8"
-	$"4BB65EB84FB654B878B66CB85EB669B876B653B86EB622B871B63AB878B632B8"
-	$"8EB652B880B6442EB6520212C0ADBDA5C0A6BDA3C125BDC0C1FCBE39C19CBDEA"
-	$"C209BE44C280BED9C267BEABC28CBEEEC2B6BFA0C2B0BF74C2CFC031C29AC155"
-	$"C2C0C0C7C28EC17E4449C22A47C06DC439BF18C4E7BF12C4DCBED3C4F9BE4BC5"
-	$"1DBE90C510BE1BC52DBD26C550BD57C54EBCD6C553BC37C54DBC87C54DBC3AC5"
-	$"5DBC41C57CBC3DC56CBC38C56637C53ABC31C550BBBCC527BAE6C4E6BB4DC512"
-	$"BA79C4B8B9B5C433BA0FC480B984C408B934C3A2B954C3DBB8E2C314B8E6C1C8"
-	$"B8CCC268B8E9C1B63141B926C0C5353DBD4DBDFABC93BE2D3F3A0206B958B5DB"
-	$"B91DB5EDB978B5D2B9BBB5CEB99927B9B9B5DEB9B8B5FEB9B8B5EEB993B60AB9"
-	$"48B60DB96DB605B911B61CB8C9B677B8E5B647B8C3B660B8B5B631B8BDB648B8"
-	$"E3B6060203B9E8B5CFB9EEB5E2B9F4B5CFBA0DB5D0BA01B5D0BA03B5E2B9F4B6"
-	$"08B9FBB5F5B9F1B5F50203BA34B5D8BA35B5EABA41B5DBBA5AB5E1BA4DB5DEBA"
-	$"4BB5EFBA32B60FBA3FB5FFBA33B5FD0221BAF9B64B3226BB2DB67CBB6FB6FABB"
-	$"50B6BBBB81B726BB9EB77FBB95B751BBAEB7C1BBB9B849BBB6B805362EBBB4B9"
-	$"29BBB9B8DEBBA2B9EBBB4FBB67BB7BBAAABB40BB97BB2BBBF9BB36BBC8BAFEBC"
-	$"A3BACCBDFFBADCBD50BACCBE55BACDBF01BAB9BEACBAD7BF31BAE3BF94BAD8BF"
-	$"63BAF1BFD2BB1CC04BBB00C011BB2AC06FBB3CC0BBBB31C096BB4EC0FDBB59C1"
-	$"87BB5AC142BB5CC1DBBB13C276BB4AC234BAE9C2A3BA74C2CDBAB2C2C6BA2EC2"
-	$"D4B9ABC298B9E4C2C3B988C27EB951C239B969C25DB93AC216B916C1C9B929C1"
-	$"EEB914C1A7B901C165B909C186B905C123B8F7C0A1B8F1C0E3B8FDC075B905C0"
-	$"1DB8FCC049B911BFE5B927BF74B918BFACB932BF41B94DBEDBB93CBF0DB9A8BD"
-	$"78BA33BAA8BA1BBC18BA37BA53BA29B9AABA34B9FEBA0FB945B9AAB88DB9EEB8"
-	$"DEB99DB87EB980B864B990B86FB963B85DB927B868B944B860B90AB871B8CEB8"
-	$"75B8EBB86BB8B4B87EB87EB877B899B87BB8D1B85FB82CB7B22A2EB845B79EB8"
-	$"75B773B861B78DB872B7362E28B88EB6333026020CB82AB850B7F6B858B8C2B8"
-	$"39B9EAB7E0B957B80EB9C0B808B951B82DB988B81CB90FB842B889B863B8CEB8"
-	$"58B85FB86AB80BB87FB835B874B82FB87DB879B878B854B87BB861B88AB827B8"
-	$"8AB843B886B7E7B8982BB891B7A3B897B74BB88CB72EB859B727B862B74CB83C"
-	$"B794B812B76FB825B77AB8282B2DB777B812B777B835B78DB865B777B867B7C2"
-	$"B861002EC0E2C513C0E2C513C11DC50CC15CC4A6C143C4D6C16DC4B5C194C4CC"
-	$"C17FC4C2C198C4F5C192C549C198C51FC18FC55AC18BC57EC18BC56CC189C58E"
-	$"C185C5AFC188C59FC176C5DFC161C642C16BC611C156C656C145C680C14AC669"
-	$"C135C6C2C111C746C11AC701C10EC756C0F9C770C0FFC760C0E9C79EC0DDC801"
-	$"C0E5C7D0C0D2C83BC0D7C8B1C0D8C876C0D757C0B4C958C0D7C929C09DC979C0"
-	$"5DC9ACC085C99DC052C9B4C044C9CCC04DC9C2C03AC9DCC017C9EBC025C9DFC0"
-	$"0AC9F9BFF0CA16BFFDCA08BFE6CA20BFD9CA39BFDFCA2CBFBCCA70BF8ACAE2BF"
-	$"A6CAAABF88CAE4BF83CAEDBF85CAEABF7BCAF9BF6ACB10BF72CB043FCB28BF24"
-	$"CB30BF3CCB29BEFECB37BEB0CB36BED6CB46BE8FCB2ABE65CAF1BE79CB0DBE66"
-	$"CAE4BE68CAC9BE67CAD6BE2ECAEEBDB0CB26BDF2CB10BD8FCB2DBD4CCB2ABD6D"
-	$"CB2BBD33CB29BD15CAFEBD18CB19BD12CADBBD31CA99BD21CAB8BD53CA5EBDBC"
-	$"CA06BD83CA2BBE2EC9B2BF34C94DBEBEC99ABF5BC934BF9DC8F1BF80C916BFDD"
-	$"C8A2C01DC7E1C006C843C020C7D5C01AC7BCC01CC7C8C019C7ACC01EC78DC01B"
-	$"C79CC031C74DC02BC6C8C02EC709C024C695C020C62FC029C661C01CC611C004"
-	$"C5DAC00FC5F5BFFEC5CABFF4C5ABBFF9C5BBBFECC58CBFDAC54EBFE5C56CBFF1"
-	$"C560C024C581C007C578C036C586C05AC57BC04CC589C06DC569C08EC542C080"
-	$"C557C09DC525C0B2C4E7C0A5C504C0C64DC0EAC505C0D8C4F9C0E7C50AC0E2C5"
-	$"13C0E5C50EC0E2C5130206BEE0C9FEBEE7C9F4BECACA1ABEA4CA56BEB5CA37BE"
-	$"9ACA68BE9ECA90BE9DCA7DBEA7CA8FBEBACA8CBEB1CA8EBEC5CA7ABED4CA52BE"
-	$"CBCA65BEE2CA30BEFEC9EEBEFCCA13BEF3C9F2001DBD26C550BD26C550BD57C5"
-	$"4EBDB9C541BD8AC551BDBCC56B3B4FBDE6C57FBDABC5CEBD47C7253B51BD47C7"
-	$"1CBD46C70BBD47C714BD32C725BD12C75FBD24C744BCF5C77EBCDEC7CEBCE9C7"
-	$"A7BCD3C7FFBCE0C865BCD1C834BCE8C882BCEEC8BEBCECC89FBCF1C8E0BCDDC9"
-	$"22BCE5C901BCD9C932BCB9C93DBCC6C938BC82C949BC16C92ABC4BC935BBABC9"
-	$"12BACEC91DBB3BC90BBAACC921BA67C92ABA89C921BA29C93AB9ABC94CB9EAC9"
-	$"45B984C94FB93AC93CB95FC945B91CC935B8EDC908B8F9C928B8E1C8EDB901C8"
-	$"BBB8F0C8CFB91AC89EB95BC877B935C880B974C86DB9A8C870B98FC871B9B8C8"
-	$"61B9D8C846B9C4C84EBA05C82DBA6BC835BA3AC829BAA7C843BB22C856BAE3C8"
-	$"563656BC0CC809BBF7C826BC21C7EDBC63C6FA3755BC66C6C9BC5EC602BC65C6"
-	$"24BC56C5D4BC41C57CBC4DC5A8BC3DC56CBC37C54DBC3AC55DBC87C54DBD26C5"
-	$"50BCD6C553BD26C5500207B948B60DB911B61CB96DB605B9B8B5FEB993B60AB9"
-	$"B7B610B9B2B632B9B6B621B9A4B635B98BB642B996B638B96CB65CB923B681B9"
-	$"4BB677B906B687B8CAB67DB8E8B680B8CAB67DB8C9B677B8C9B677B8E5B64702"
-	$"16B8E8B717B8CBB751B8F7B6FFB925B6DDB906B6E1B943B6DFB966B712B958B6"
-	$"FAB976B72EB9A1B75DB986B74BB9C4B775BA16B787B9F0B777BA3DB798BA4CB7"
-	$"F0BA58B7C6BA42B80FBA08B830BA26B826B9DAB83DB97BB843B9AAB839B926B8"
-	$"52B87EB877B8D1B85FB87EB877B879B878B879B878B854B87BB80BB87FB82FB8"
-	$"7DB835B874B889B863B85FB86AB8CEB858B951B82DB90FB842B988B81CB9EAB7"
-	$"E0B9C0B808B957B80EB82AB850B8C2B839B7F6B858B78DB865B7C2B861B777B8"
-	$"67B74BB85CB761B863B761B840B794B812B77AB828B797B811B79FB80CB79CB8"
-	$"0EB7ADB80CB7BFB7F7B7BAB804B7D5B7E9B803B7D1B7ECB7DCB826B7C5B865B7"
-	$"A0B847B7B5B899B77B020BC043C5B2C041C5F1C04DC5BBC05DC5D3C059C5C5C0"
-	$"6EC600C073C661C075C631C074C6B9C071C76BC075C712C068C7B3C054C843C0"
-	$"68C7FDC047C875C017C8D3C040C8AEC00CC8DFBFEDC8E7BFFDC8E4BFECC8B9C0"
-	$"1BC86AC005C891C039C836C04CC7C1C043C7FBC056C794C057C739C054C767C0"
-	$"5AC6F6C052C66EC054C6B2C050C62F0207BE51C9CFBE2AC9E4BE6AC9C2BEA3C9"
-	$"C1BE88C9AEBE8BC9E0BE45C9FCBE63C9E7BE19CA18BDC4CA55BDE9CA2FBDB0CA"
-	$"69BD86CA8EBDA2CA85BD75CA8CBD77CA69BD77CA76BD89CA3DBDDACA09BDB6CA"
-	$"25BDFDC9ED0008B98BB695B98BB695B98DB67AB9AAB64DB99CB663B9B3B659B9"
-	$"D0B661B9C0B664B9F6B65FBA43B65FBA1EB66BBA51B67ABA63B6B5BA61B695BA"
-	$"66B6DDBA3AB724BA5AB709BA1FB73DB9D5B72FB9F5B740B99DB714B98BB695B9"
-	$"82B6D1B98BB6950203BA18B677BA3AB673B9DCB683BA1DB6F4B9DFB6EEBA3BB6"
-	$"F2BA50B6B5BA52B6D2BA4FB6970206B8D4B692B8BBB6A2B8E4B6A8B8F1B6DBB8"
-	$"F3B6BFB8DFB6D2B8B3B6D5B8C5B6C2B89AB6EFB8BAB72FB8A5B717B8B2B736B8"
-	$"A1B743B8A9B73DB880B71AB884B6AFB876B6E2B89EB6A50025C413BBB7C413BB"
-	$"B7C438BBADC483BB9FC45DBB9EC48DBB9EC49ABBABC494BBA4C49ABBBFC482BB"
-	$"E0C48FBBD1C45FBC0CC403BC4EC42FBC2BC45EBC29C523BC05C4BEBC00C540BC"
-	$"06C577BC1FC561BC0AC58CBC36C573BC72C587BC5CC553BC97C4FBBCC5C524BC"
-	$"ABC4C1BCE9C45DBD45C48EBD16C4B0BD294EBCEAC500BD04C57CBCDFC5D3BCEF"
-	$"C5AEBCD2C5E9BD06C5F4BD48C5F8BD28C5E2BD65C5A1BD7EC5C0BD72C52FBDA7"
-	$"C450BE0AC4B3BDBFC4A2BDF8C54ABDFCC4F7BDEEC56FBE02C5B0BE2AC594BE0F"
-	$"C5BDBE37C5C2BE5DC5C8BE4AC5BBBE70C594BE7EC5A6BE78C54CBE92C4B7BE91"
-	$"C500BE8AC473BE93C3EDBE9CC430BE93C372BEA6C280BED9C2F6BEB4C267BEAB"
-	$"C223BE5DC248BE81C233BE53C255BE41C244BE49C2A5BE1EC34ABDE9C2F5BDFD"
-	$"C38BBDD7C40EBDB9C3D3BDDCC3E0BDAEC380BDB5C3AFBDB0C308BDBFC22ABE1B"
-	$"C293BDE2C21ABE24C1FCBE39C20BBE2EC19CBDEAC0ADBDA5C125BDC0C0F5BD4A"
-	$"C19BBCA8C147BCF7C1E3BC66C282BBF6C22EBC28C2B6BBD8C32DBBBF48BBBFC3"
-	$"19BBD7C2EBBC01C301BBECC2E1BC09C2CEBC1BC2D8BC12C2BDBC2CC2ABBC5AC2"
-	$"B3BC43C31FBC1BC413BBB7C394BBDBC413BBB70006C29BBCA8C29BBCA8C23EBC"
-	$"DCC1B9BD86C1E9BD26C1E4BD6FC229BD29C204BD48C261BCF3C2E6BCA1C2A0BC"
-	$"C4C2FFBC95C32DBC74C319BC88C2F9BC79C29BBCA8C2C9BC91C29BBCA80205C3"
-	$"FFBC88C41EBC7DC3B3BCA2C33EBD13C36ABCCFC36DBD00C3BEBCC1C393BCDCC3"
-	$"E1BCADC42BBC8EC405BC9AC43EBC89C45FBC75C44FBC81C43EBC74021FBB1CC0"
-	$"4BBB2AC06FBB1FC04ABB29C048BB26C049BB3DC04DBB61C05CBB50C053BB75C0"
-	$"68BB91C08DBB83C07BBBBEC08BBC10C0B3BBEFC090BC2CC0CABC29C112BC27C0"
-	$"F1BC43C11DBC72C142BC62C128BC80C15ABC6EC18EBC7AC177BC5DC1AEBC22C1"
-	$"D9BC3EC1C4BC31C1F2BC35C22DBC42C20FBC27C260BBC8C28EBBF7C27EBBD6C2"
-	$"ABBBE2C2ECBBE5C2CABBE1C31EBB81C34BBBB3C34835C350BB1DC332BB3CC341"
-	$"BB22C359BB10C3A5BB20C381BB02C3CCBAADC3C1BACEC3CFBA7CC3AABA3EC351"
-	$"BA57C380BA37C370BA13C3A8BA33C398B9FCC3B2B9D6C392B9E6C3A1B9AFC36B"
-	$"B981C305B993C339B977C30EB962C321B96CC318B931C2EBB94BC25EB94AC29F"
-	$"B939C273B908C28DB927C28CB8FBC25FB904C1FEB900C22EB907C1ECB916C1C9"
-	$"B90FC1DAB929C1EEB951C239B93AC216B969C25DB9ABC298B988C27EB9E4C2C3"
-	$"BA74C2CDBA2EC2D4BAB2C2C6BB13C276BAE9C2A3BB4AC234BB59C187BB5CC1DB"
-	$"BB5AC142BB3CC0BBBB4EC0FDBB31C096021AC12EC2E5C118C2E2C14DC2E3C166"
-	$"C2A8C15CC2C2C170C2BEC17FC2EDC179C2D5C196C34AC181C40BC19DC3AEC175"
-	$"C42CC147C463C164C44FC130C472C115C445C121C454C107C469C0C7C49DC0F3"
-	$"C497C0A9C4A2C08BC46EC09AC483C083C49DC04FC4F0C073C4CEC03BC505BFFD"
-	$"C4FBC016C50DBFE7C4EABFCFC4B6BFDDC4CEBFC1C4C9BF97C4E3BFB4C4E8BF78"
-	$"C4DCBF4EC4ABBF62C4C2BF3AC494BF1EC45CBF30C475BF0DC44CBEE8C42CBEF3"
-	$"C443BEBFC3E5BED0C340BEC1C38FBED8C33EBEE9C339BEE0C33BBEF2C350BF13"
-	$"C376BEFBC36ABF33C387BF75C364BF5CC37CBF90C34DBFA6C30ABF9CC32ABFB4"
-	$"C324BFDDC351BFBFC345BFF4C35CC022C345C00EC352C03BC334C055C2FDC048"
-	$"C318C05FC309C073C320C068C316C083C330C0B1C328C09DC32EC0D8C318C0F7"
-	$"C2C8C0EDC2EFC108C2D3020AC201BC28C1B8BC58C26ABBDDC36DBBAEC2E9BBA2"
-	$"C360BBB9C343BBCCC352BBC3C325BBDDC2EBBC01C30ABBF2C301BBECC32DBBBF"
-	$"C319BBD748BBBFC282BBF6C2B6BBD8C22EBC28C19BBCA8C1E3BC66C147BCF7C0"
-	$"ADBDA5C0F5BD4AC0A6BDA3C098BD9EC09FBDA1C0CBBD58C13DBCD5C103BD16C1"
-	$"7ABC970205C29BBCA8C23EBCDCC2C9BC91C32DBC74C2F9BC79C319BC88C2E6BC"
-	$"A1C2FFBC95C2A0BCC4C229BD29C261BCF3C204BD48C1B9BD86C1E4BD6FC1E9BD"
-	$"260205C3FFBC88C3B3BCA2C41EBC7DC45FBC75C43EBC74C44FBC81C42BBC8EC4"
-	$"3EBC89C405BC9AC3BEBCC1C3E1BCADC393BCDCC33EBD13C36DBD00C36ABCCF02"
-	$"07C22ABE1BC21ABE24C293BDE2C380BDB5C308BDBFC3AFBDB0C40EBDB9C3E0BD"
-	$"AEC3D3BDDCC34ABDE9C38BBDD7C2F5BDFDC255BE41C2A5BE1EC244BE49C223BE"
-	$"5DC233BE53C216BE50C1FCBE39C209BE44C20BBE2E02044030C34530BC3A3030"
-	$"4030BC3A30C3454050BC3A50C34550504050C34550BC3A1C0A06011B024067BA"
-	$"0000000000003EDA12C3C3B549B8E30A051314151608090A0D171A1202030405"
-	$"0607110100124032F3000000000000402C3F38AEA3C438E301178222040A0001"
-	$"00024032F3000000000000402C3F38AEA3C438E30A000101024032F300000000"
-	$"0000402C3F38AEA3C438E30A000102024032F3000000000000402C3F38AEA3C4"
-	$"38E30A010103024032F3000000000000402C3F38AEA3C438E30A010104024032"
-	$"F3000000000000402C3F38AEA3C438E30A010105024032F3000000000000402C"
-	$"3F38AEA3C438E30A010106024032F3000000000000402C3F38AEA3C438E30A01"
-	$"0107024032F3000000000000402C3F38AEA3C438E30A01020809024032F30000"
-	$"00000000402C3F38AEA3C438E30A01010A024032F3000000000000402C3F38AE"
-	$"A3C438E30A02010B024032F3000000000000402C3F38AEA3C438E30A02010C02"
-	$"4032F3000000000000402C3F38AEA3C438E30A02010D024032F3000000000000"
-	$"402C3F38AEA3C438E30A02010E024032F3000000000000402C3F38AEA3C438E3"
-	$"0A03020F10024032F3000000000000402C3F38AEA3C438E30A030111024032F3"
-	$"000000000000402C3F38AEA3C438E30A0503121314124032F300000000000040"
-	$"2C3F38AEA3C438E301178100040A0303121314024032F3000000000000402C3F"
-	$"38AEA3C438E30A040115124032F3000000000000402C3F38AEA3C438E3011781"
-	$"00040A030115024032F3000000000000402C3F38AEA3C438E30A040116124032"
-	$"F3000000000000402C3F38AEA3C438E301178100040A030116024032F3000000"
-	$"000000402C3F38AEA3C438E30A040117024032F3000000000000402C3F38AEA3"
-	$"C438E30A040118024032F3000000000000402C3F38AEA3C438E30A0401190240"
-	$"32F3000000000000402C3F38AEA3C438E30A04011A024032F300000000000040"
-	$"2C3F38AEA3C438E3"
+	$"6E63696609020016023948D63D3094BDDFAB39FD1F4ABA27497CCF00FFFF1002"
+	$"010602374523320A99B7657F3CB86948145E49514700F3C7B8FFD56138020106"
+	$"02377098344AFAB86DC73BA4CE49CB2B4B39D100F3C7B8FFD5613803CDBCB705"
+	$"FF05A4050104017B020116043600000000000000003600004780004480000001"
+	$"480169FFFFFF0D0212C0ADBDA5C0A6BDA3C125BDC0C1FCBE39C19CBDEAC209BE"
+	$"44C280BED9C267BEABC28CBEEEC2B6BFA0C2B0BF74C2CFC031C29AC155C2C0C0"
+	$"C7C28EC17E4449C22A47C06DC439BF18C4E7BF12C4DCBED3C4F9BE4BC51DBE90"
+	$"C510BE1BC52DBD26C550BD57C54EBCD6C553BC37C54DBC87C54DBC3AC55DBC41"
+	$"C57CBC3DC56CBC38C56637C53ABC31C550BBBCC527BAE6C4E6BB4DC512BA79C4"
+	$"B8B9B5C433BA0FC480B984C408B934C3A2B954C3DBB8E2C314B8E6C1C8B8CCC2"
+	$"68B8E9C1B63141B926C0C5353DBD4DBDFABC93BE2D3F3A0221BAF9B64B3226BB"
+	$"2DB67CBB6FB6FABB50B6BBBB81B726BB9EB77FBB95B751BBAEB7C1BBB9B849BB"
+	$"B6B805362EBBB4B929BBB9B8DEBBA2B9EBBB4FBB67BB7BBAAABB40BB97BB2BBB"
+	$"F9BB36BBC8BAFEBCA3BACCBDFFBADCBD50BACCBE55BACDBF01BAB9BEACBAD7BF"
+	$"31BAE3BF94BAD8BF63BAF1BFD2BB1CC04BBB00C011BB2AC06FBB3CC0BBBB31C0"
+	$"96BB4EC0FDBB59C187BB5AC142BB5CC1DBBB13C276BB4AC234BAE9C2A3BA74C2"
+	$"CDBAB2C2C6BA2EC2D4B9ABC298B9E4C2C3B988C27EB951C239B969C25DB93AC2"
+	$"16B916C1C9B929C1EEB914C1A7B901C165B909C186B905C123B8F7C0A1B8F1C0"
+	$"E3B8FDC075B905C01DB8FCC049B911BFE5B927BF74B918BFACB932BF41B94DBE"
+	$"DBB93CBF0DB9A8BD78BA33BAA8BA1BBC18BA37BA53BA29B9AABA34B9FEBA0FB9"
+	$"45B9AAB88DB9EEB8DEB99DB87EB980B864B990B86FB963B85DB927B868B944B8"
+	$"60B90AB871B8CEB875B8EBB86BB8B4B87EB87EB877B899B87BB8D1B85FB82CB7"
+	$"B22A2EB845B79EB875B773B861B78DB872B7362E28B88EB6333026020F444CC1"
+	$"43C47EC15CC4B14350434EC0E7C634C0D7C8B14157C0D757C0B4C958C0D7C929"
+	$"4159BFD9CA39BFDFCA2CBFBCCA70BF83CAEDBF85CAEABF7BCAF9BF6ACB10BF72"
+	$"CB043FCB28BEB0CB36BED6CB46BE8FCB2ABE68CAC9BE67CAD6BE2ECAEEBDB0CB"
+	$"26BDF2CB103A5DBD15CAFEBD18CB19395BBDBCCA06BD83CA2BBE2EC9B2BF34C9"
+	$"4DBEBEC99A40574053BFC7C7E2BFC7C5E43F4EBF64C5723F4E02143B4E3A4EBD"
+	$"C5C57D3953BD0DC6D5BCEAC783BCEEC8BE3856BCF1C8E0BCB9C93D3958BC82C9"
+	$"49BC16C92ABC4BC935BBABC912BACEC91DBB3BC90BBAACC921BA67C92ABA89C9"
+	$"213158B93AC93C3158B91CC935B8EDC908B8F9C9282F56B95BC877B935C880B9"
+	$"74C86DB9A8C870B98FC871B9B8C861B9D8C846B9C4C84EBA05C82DBA6BC835BA"
+	$"3AC829BAA7C843BB22C856BAE3C8563656BC0CC809BBF7C826BC21C7EDBC63C6"
+	$"FA3755BC66C6C9BC5EC602BC65C624BC56C5D4BC41C57CBC4DC5A8BC3DC56CBC"
+	$"37C54DBC3AC55DBC87C54DBD26C550BCD6C553BD26C5500207B8E8B717B8CBB7"
+	$"51B8F7B6FFB925B6DDB906B6E1B943B6DFB966B712B958B6FAB976B72EBA16B7"
+	$"87312BBA3DB798BA4CB7F0BA58B7C6312FB74BB85C2D2E2B2C2E2B2D2CB8C7B7"
+	$"3D0025C413BBB7C413BBB7C438BBADC483BB9FC45DBB9EC48DBB9EC49ABBABC4"
+	$"94BBA4C49ABBBFC482BBE0C48FBBD1C45FBC0CC403BC4EC42FBC2BC45EBC29C5"
+	$"23BC05C4BEBC00C540BC06C577BC1FC561BC0AC58CBC36C573BC72C587BC5CC5"
+	$"53BC97C4FBBCC5C524BCABC4C1BCE9C45DBD45C48EBD16C4B0BD294EBCEAC500"
+	$"BD04C57CBCDFC5D3BCEFC5AEBCD2C5E9BD06C5F4BD48C5F8BD28C5E2BD65C5A1"
+	$"BD7EC5C0BD72C52FBDA7C450BE0AC4B3BDBFC4A2BDF8C54ABDFCC4F7BDEEC56F"
+	$"BE02C5B0BE2AC594BE0FC5BDBE37C5C2BE5DC5C8BE4AC5BBBE70C594BE7EC5A6"
+	$"BE78C54CBE92C4B7BE91C500BE8AC473BE93C3EDBE9CC430BE93C372BEA6C280"
+	$"BED9C2F6BEB4C267BEABC223BE5DC248BE81C233BE53C255BE41C244BE49C2A5"
+	$"BE1EC34ABDE9C2F5BDFDC38BBDD7C40EBDB9C3D3BDDCC3E0BDAEC380BDB5C3AF"
+	$"BDB0C308BDBFC22ABE1BC293BDE2C21ABE24C1FCBE39C20BBE2EC19CBDEAC0AD"
+	$"BDA5C125BDC0C0F5BD4AC19BBCA8C147BCF7C1E3BC66C282BBF6C22EBC28C2B6"
+	$"BBD8C32DBBBF48BBBFC319BBD7C2EBBC01C301BBECC2E1BC09C2CEBC1BC2D8BC"
+	$"12C2BDBC2CC2ABBC5AC2B3BC43C31FBC1BC413BBB7C394BBDBC413BBB7021FBB"
+	$"1CC04BBB2AC06FBB1FC04ABB29C048BB26C049BB3DC04DBB61C05CBB50C053BB"
+	$"75C068BB91C08DBB83C07BBBBEC08BBC10C0B3BBEFC090BC2CC0CABC29C112BC"
+	$"27C0F1BC43C11DBC72C142BC62C128BC80C15ABC6EC18EBC7AC177BC5DC1AEBC"
+	$"22C1D9BC3EC1C4BC31C1F2BC35C22DBC42C20FBC27C260BBC8C28EBBF7C27EBB"
+	$"D6C2ABBBE2C2ECBBE5C2CABBE1C31EBB81C34BBBB3C34835C350BB1DC332BB3C"
+	$"C341BB22C359BB10C3A5BB20C381BB02C3CCBAADC3C1BACEC3CFBA7CC3AABA3E"
+	$"C351BA57C380BA37C370BA13C3A8BA33C398B9FCC3B2B9D6C392B9E6C3A1B9AF"
+	$"C36BB981C305B993C339B977C30EB962C321B96CC318B931C2EBB94BC25EB94A"
+	$"C29FB939C273B908C28DB927C28CB8FBC25FB904C1FEB900C22EB907C1ECB916"
+	$"C1C9B90FC1DAB929C1EEB951C239B93AC216B969C25DB9ABC298B988C27EB9E4"
+	$"C2C3BA74C2CDBA2EC2D4BAB2C2C6BB13C276BAE9C2A3BB4AC234BB59C187BB5C"
+	$"C1DBBB5AC142BB3CC0BBBB4EC0FDBB31C096021AC12EC2E5C118C2E2C14DC2E3"
+	$"C166C2A8C15CC2C2C170C2BEC17FC2EDC179C2D5C196C34AC181C40BC19DC3AE"
+	$"C175C42CC147C463C164C44FC130C472C115C445C121C454C107C469C0C7C49D"
+	$"C0F3C497C0A9C4A2C08BC46EC09AC483C083C49DC04FC4F0C073C4CEC03BC505"
+	$"BFFDC4FBC016C50DBFE7C4EABFCFC4B6BFDDC4CEBFC1C4C9BF97C4E3BFB4C4E8"
+	$"BF78C4DCBF4EC4ABBF62C4C2BF3AC494BF1EC45CBF30C475BF0DC44CBEE8C42C"
+	$"BEF3C443BEBFC3E5BED0C340BEC1C38FBED8C33EBEE9C339BEE0C33BBEF2C350"
+	$"BF13C376BEFBC36ABF33C387BF75C364BF5CC37CBF90C34DBFA6C30ABF9CC32A"
+	$"BFB4C324BFDDC351BFBFC345BFF4C35CC022C345C00EC352C03BC334C055C2FD"
+	$"C048C318C05FC309C073C320C068C316C083C330C0B1C328C09DC32EC0D8C318"
+	$"C0F7C2C8C0EDC2EFC108C2D30205C29BBCA8C23EBCDCC2C9BC91C32DBC74C2F9"
+	$"BC79C319BC88C2E6BCA1C2FFBC95C2A0BCC4C229BD29C261BCF3C204BD48C1B9"
+	$"BD86C1E4BD6FC1E9BD260205C3FFBC88C3B3BCA2C41EBC7DC45FBC75C43EBC74"
+	$"C44FBC81C42BBC8EC43EBC89C405BC9AC3BEBCC1C3E1BCADC393BCDCC33EBD13"
+	$"C36DBD00C36ABCCF0207C22ABE1BC21ABE24C293BDE2C380BDB5C308BDBFC3AF"
+	$"BDB0C40EBDB9C3E0BDAEC3D3BDDCC34ABDE9C38BBDD7C2F5BDFDC255BE41C2A5"
+	$"BE1EC244BE49C223BE5DC233BE53C216BE50C1FCBE39C209BE44C20BBE2E0204"
+	$"4030C34530BC3A30304030BC3A30C3454050BC3A50C34550504050C34550BC3A"
+	$"02042F2330232E232D252D242D262F272E273027312531263124150A07010B02"
+	$"4067BA0000000000003EDA12C3C3B549B8E30A060103124032F3000000000000"
+	$"402C3F38AEA3C438E301158300040A010103024032F3000000000000402C3F38"
+	$"AEA3C438E30A06080607020A00010504124032F3000000000000402C3F38AEA3"
+	$"C438E301178322040A000100024032F3000000000000402C3F38AEA3C438E30A"
+	$"010101024032F3000000000000402C3F38AEA3C438E30A020102024032F30000"
+	$"00000000402C3F38AEA3C438E30A030104024032F3000000000000402C3F38AE"
+	$"A3C438E30A060105124032F3000000000000402C3F38AEA3C438E30117810004"
+	$"0A040105024032F3000000000000402C3F38AEA3C438E30A050106124032F300"
+	$"0000000000402C3F38AEA3C438E301178100040A040106024032F30000000000"
+	$"00402C3F38AEA3C438E30A050107124032F3000000000000402C3F38AEA3C438"
+	$"E301178100040A040107024032F3000000000000402C3F38AEA3C438E30A0501"
+	$"08024032F3000000000000402C3F38AEA3C438E30A050109024032F300000000"
+	$"0000402C3F38AEA3C438E30A05010A024032F3000000000000402C3F38AEA3C4"
+	$"38E30A06010C123ED3400000000000003ED34044B3E640EFDE01178422040A08"
+	$"010C023ED3400000000000003ED34044B3E640EFDE0A06010C123FFFFF000000"
+	$"0000003FFFFF44000040000001178300040A08010C023FFFFF0000000000003F"
+	$"FFFF440000400000"
 };
diff --git a/app-emulation/qemu/qemu-3.1.0.recipe b/app-emulation/qemu/qemu-3.1.0.recipe
index aed49b50a..ba1a62142 100644
--- a/app-emulation/qemu/qemu-3.1.0.recipe
+++ b/app-emulation/qemu/qemu-3.1.0.recipe
@@ -7,7 +7,7 @@ achieves very good performance."
 HOMEPAGE="https://www.qemu.org/"
 COPYRIGHT="2003-2018 Fabrice Bellard"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.qemu.org/qemu-$portVersion.tar.xz"
 CHECKSUM_SHA256="6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc"
 SOURCE_DIR="qemu-$portVersion"
@@ -41,6 +41,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:iasl
+	cmd:smbd$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libcapstone$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
@@ -169,6 +170,7 @@ BUILD()
 		--enable-capstone=system \
 		--enable-gcrypt \
 		--disable-tpm \
+		--smbd=/$relativeBinDir/smbd \
 		--target-list="${targetList::-1}"
 
 	make $jobArgs