diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 71c07af9ca8759852f76b57f87b3cd5b8792600b..dbf3d75ede442068396e3ddd2d9aee347bffee07 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -360,6 +360,7 @@ as release notes for end user on a Recalbox upgrade.
 - Bump libretro uae4arm
 - Bump bebeem
 - Bump retro8
+- Bump Amiberry to v5.4
 - Update of the theme for the X68000 system
 - Add support for BCM20702, BCM20703, BCM43142 bluetooth chipsets
 - Bump libretro gPSP
diff --git a/package/amiberry/amiberry-0000-resources-path.patch b/package/amiberry/amiberry-0000-resources-path.patch
index 3113c2fdb39e3af38e357ba2ff9978dd3a5f6d95..51bce1f53413e7c4af0674c7c542a42359d1111e 100644
--- a/package/amiberry/amiberry-0000-resources-path.patch
+++ b/package/amiberry/amiberry-0000-resources-path.patch
@@ -1,8 +1,8 @@
 diff --git a/src/driveclick.cpp b/src/driveclick.cpp
-index 56b908ed..82b88710 100644
+index 521b5d26..fa90e081 100644
 --- a/src/driveclick.cpp
 +++ b/src/driveclick.cpp
-@@ -542,19 +542,19 @@ int driveclick_loadresource(struct drvsample* sp, int drivetype)
+@@ -540,19 +540,19 @@ int driveclick_loadresource(struct drvsample* sp, int drivetype)
  		auto* s = sp + type;
  		switch (type) {
  		case 0:
@@ -27,204 +27,281 @@ index 56b908ed..82b88710 100644
  			break;
  		default:
  			continue;
+diff --git a/src/osdep/amiberry_filesys.cpp b/src/osdep/amiberry_filesys.cpp
+index a8464956..a76d5534 100644
+--- a/src/osdep/amiberry_filesys.cpp
++++ b/src/osdep/amiberry_filesys.cpp
+@@ -136,6 +136,7 @@ std::string prefix_with_application_directory_path(std::string currentpath)
+ 
+ std::string prefix_with_data_path(std::string filename)
+ {
++  if (!filename.empty() && filename[0] == '/') return filename;
+ #ifdef __MACH__
+ 	CFBundleRef mainBundle = CFBundleGetMainBundle();
+ 	if (mainBundle == NULL)
 diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp
-index 44f6086c..4d721265 100644
+index e11c51fc..e4b75aaa 100644
 --- a/src/osdep/amiberry_gfx.cpp
 +++ b/src/osdep/amiberry_gfx.cpp
-@@ -1880,7 +1880,7 @@ int graphics_init(bool mousecapture)
+@@ -2034,7 +2034,7 @@ int graphics_init(bool mousecapture)
  		}
  		check_error_sdl(mon->sdl_window == nullptr, "Unable to create window:");
  
--		auto* const icon_surface = IMG_Load("data/amiberry.png");
-+		auto* const icon_surface = IMG_Load("/usr/share/amiberry/data/amiberry.png");
+-		auto* const icon_surface = IMG_Load(prefix_with_data_path("amiberry.png").c_str());
++		auto* const icon_surface = IMG_Load(prefix_with_data_path("/usr/share/amiberry/data/amiberry.png").c_str());
  		if (icon_surface != nullptr)
  		{
  			SDL_SetWindowIcon(mon->sdl_window, icon_surface);
+diff --git a/src/osdep/gui/ControllerMap.cpp b/src/osdep/gui/ControllerMap.cpp
+index a115f2fd..334e40a1 100644
+--- a/src/osdep/gui/ControllerMap.cpp
++++ b/src/osdep/gui/ControllerMap.cpp
+@@ -481,10 +481,10 @@ WatchJoystick(SDL_Joystick* joystick)
+ 	Uint32 alpha_ticks = 0;
+ 	SDL_JoystickID nJoystickID;
+ 
+-	background_front_image = gcn::Image::load(prefix_with_data_path("controllermap.png"));
++	background_front_image = gcn::Image::load(prefix_with_data_path("/usr/share/amiberry/data/controllermap.png"));
+ 	background_front_icon = new gcn::Icon(background_front_image);
+ 
+-	background_back_image = gcn::Image::load(prefix_with_data_path("controllermap_back.png"));
++	background_back_image = gcn::Image::load(prefix_with_data_path("/usr/share/amiberry/data/controllermap_back.png"));
+ 	background_back_icon = new gcn::Icon(background_back_image);
+ 
+ #ifdef USE_DISPMANX
+@@ -492,8 +492,8 @@ WatchJoystick(SDL_Joystick* joystick)
+ #elif USE_OPENGL
+ 	//TODO need implementation
+ #else
+-	button = LoadTexture(sdl_renderer, prefix_with_data_path("button.png").c_str(), SDL_TRUE);
+-	axis = LoadTexture(sdl_renderer, prefix_with_data_path("axis.png").c_str(), SDL_TRUE);
++	button = LoadTexture(sdl_renderer, prefix_with_data_path("/usr/share/amiberry/data/button.png").c_str(), SDL_TRUE);
++	axis = LoadTexture(sdl_renderer, prefix_with_data_path("/usr/share/amiberry/data/axis.png").c_str(), SDL_TRUE);
+ #endif
+ 
+ 	/* Print info about the joystick we are watching */
 diff --git a/src/osdep/gui/PanelAbout.cpp b/src/osdep/gui/PanelAbout.cpp
-index a9815c0d..26168620 100644
+index 69ae6116..e599cd11 100644
 --- a/src/osdep/gui/PanelAbout.cpp
 +++ b/src/osdep/gui/PanelAbout.cpp
-@@ -24,7 +24,7 @@ void InitPanelAbout(const struct _ConfigCategory& category)
+@@ -24,7 +24,7 @@ void InitPanelAbout(const config_category& category)
  	SDL_VERSION(&compiled);
  	SDL_GetVersion(&linked);
  	
--	amiberryLogoImage = gcn::Image::load(prefix_with_application_directory_path("data/amiberry-logo.png"));
-+	amiberryLogoImage = gcn::Image::load(prefix_with_application_directory_path("/usr/share/amiberry/data/amiberry-logo.png"));
+-	amiberryLogoImage = gcn::Image::load(prefix_with_data_path("amiberry-logo.png"));
++	amiberryLogoImage = gcn::Image::load(prefix_with_data_path("/usr/share/amiberry/data/amiberry-logo.png"));
  	icon = new gcn::Icon(amiberryLogoImage);
  	lblEmulatorVersion = new gcn::Label(get_version_string());
- 	lblCopyright = new gcn::Label("Copyright (C) 2016-2021 Dimitris Panokostas");
+ 	lblCopyright = new gcn::Label("Copyright (C) 2016-2022 Dimitris Panokostas");
+diff --git a/src/osdep/gui/PanelCustom.cpp b/src/osdep/gui/PanelCustom.cpp
+index e0a75d27..9842dbc0 100644
+--- a/src/osdep/gui/PanelCustom.cpp
++++ b/src/osdep/gui/PanelCustom.cpp
+@@ -313,7 +313,7 @@ void InitPanelCustom(const config_category& category)
+ 	cmdSetHotkey->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
+ 	cmdSetHotkey->setBaseColor(gui_baseCol);
+ 	cmdSetHotkey->addActionListener(grpActionListener);
+-	cmdSetHotkeyClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdSetHotkeyClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
+ 	cmdSetHotkeyClear->setBaseColor(gui_baseCol);
+ 	cmdSetHotkeyClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
+ 	cmdSetHotkeyClear->setId("cmdSetHotkeyClear");
+diff --git a/src/osdep/gui/PanelDiskSwapper.cpp b/src/osdep/gui/PanelDiskSwapper.cpp
+index 502123d7..a68c68e9 100644
+--- a/src/osdep/gui/PanelDiskSwapper.cpp
++++ b/src/osdep/gui/PanelDiskSwapper.cpp
+@@ -255,7 +255,7 @@ void InitPanelDiskSwapper(const config_category& category)
+ 		cmdDiskSwapperListAdd[row]->setId(tmp);
+ 		cmdDiskSwapperListAdd[row]->addActionListener(diskSwapperAddActionListener);
+ 
+-		cmdDiskSwapperListDelete[row] = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++		cmdDiskSwapperListDelete[row] = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
+ 		cmdDiskSwapperListDelete[row]->setBaseColor(gui_baseCol);
+ 		cmdDiskSwapperListDelete[row]->setSize(SMALL_BUTTON_HEIGHT, SMALL_BUTTON_HEIGHT);
+ 		snprintf(tmp, 20, "cmdDiskSwapperDel%d", row);
 diff --git a/src/osdep/gui/PanelHD.cpp b/src/osdep/gui/PanelHD.cpp
-index 0f345eba..d5aa8beb 100644
+index 346567ff..5a08981d 100644
 --- a/src/osdep/gui/PanelHD.cpp
 +++ b/src/osdep/gui/PanelHD.cpp
-@@ -369,7 +369,7 @@ void InitPanelHD(const struct _ConfigCategory& category)
- 		listCmdProps[row]->setId(tmp);
+@@ -357,7 +357,7 @@ void InitPanelHD(const config_category& category)
+ 		listCmdProps[row]->setId(id_string);
  		listCmdProps[row]->addActionListener(hdEditActionListener);
  
--		listCmdDelete[row] = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+		listCmdDelete[row] = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-		listCmdDelete[row] = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++		listCmdDelete[row] = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  		listCmdDelete[row]->setBaseColor(gui_baseCol);
  		listCmdDelete[row]->setSize(SMALL_BUTTON_HEIGHT, SMALL_BUTTON_HEIGHT);
- 		snprintf(tmp, 20, "cmdDel%d", row);
+ 		id_string = "cmdDel" + to_string(row);
 diff --git a/src/osdep/gui/PanelMisc.cpp b/src/osdep/gui/PanelMisc.cpp
-index 22743f09..ed8c49cb 100644
+index b39319e2..decb4bdf 100644
 --- a/src/osdep/gui/PanelMisc.cpp
 +++ b/src/osdep/gui/PanelMisc.cpp
-@@ -464,7 +464,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
+@@ -438,7 +438,7 @@ void InitPanelMisc(const config_category& category)
  	cmdKeyOpenGUI->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyOpenGUI->setBaseColor(gui_baseCol);
  	cmdKeyOpenGUI->addActionListener(miscActionListener);
--	cmdKeyOpenGUIClear = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+	cmdKeyOpenGUIClear = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-	cmdKeyOpenGUIClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdKeyOpenGUIClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  	cmdKeyOpenGUIClear->setBaseColor(gui_baseCol);
  	cmdKeyOpenGUIClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyOpenGUIClear->setId("cmdKeyOpenGUIClear");
-@@ -481,7 +481,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
+@@ -455,7 +455,7 @@ void InitPanelMisc(const config_category& category)
  	cmdKeyForQuit->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyForQuit->setBaseColor(gui_baseCol);
  	cmdKeyForQuit->addActionListener(miscActionListener);
--	cmdKeyForQuitClear = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+	cmdKeyForQuitClear = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-	cmdKeyForQuitClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdKeyForQuitClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  	cmdKeyForQuitClear->setBaseColor(gui_baseCol);
  	cmdKeyForQuitClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyForQuitClear->setId("cmdKeyForQuitClear");
-@@ -498,7 +498,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
+@@ -472,7 +472,7 @@ void InitPanelMisc(const config_category& category)
  	cmdKeyActionReplay->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyActionReplay->setBaseColor(gui_baseCol);
  	cmdKeyActionReplay->addActionListener(miscActionListener);
--	cmdKeyActionReplayClear = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+	cmdKeyActionReplayClear = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-	cmdKeyActionReplayClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdKeyActionReplayClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  	cmdKeyActionReplayClear->setBaseColor(gui_baseCol);
  	cmdKeyActionReplayClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyActionReplayClear->setId("cmdKeyActionReplayClear");
-@@ -515,7 +515,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
+@@ -489,7 +489,7 @@ void InitPanelMisc(const config_category& category)
  	cmdKeyFullScreen->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyFullScreen->setBaseColor(gui_baseCol);
  	cmdKeyFullScreen->addActionListener(miscActionListener);
--	cmdKeyFullScreenClear = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+	cmdKeyFullScreenClear = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-	cmdKeyFullScreenClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdKeyFullScreenClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  	cmdKeyFullScreenClear->setBaseColor(gui_baseCol);
  	cmdKeyFullScreenClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyFullScreenClear->setId("cmdKeyFullScreenClear");
-@@ -532,7 +532,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
+@@ -506,7 +506,7 @@ void InitPanelMisc(const config_category& category)
  	cmdKeyMinimize->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyMinimize->setBaseColor(gui_baseCol);
  	cmdKeyMinimize->addActionListener(miscActionListener);
--	cmdKeyMinimizeClear = new gcn::ImageButton(prefix_with_application_directory_path("data/delete.png"));
-+	cmdKeyMinimizeClear = new gcn::ImageButton(prefix_with_application_directory_path("/usr/share/amiberry/data/delete.png"));
+-	cmdKeyMinimizeClear = new gcn::ImageButton(prefix_with_data_path("delete.png"));
++	cmdKeyMinimizeClear = new gcn::ImageButton(prefix_with_data_path("/usr/share/amiberry/data/delete.png"));
  	cmdKeyMinimizeClear->setBaseColor(gui_baseCol);
  	cmdKeyMinimizeClear->setSize(SMALL_BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
  	cmdKeyMinimizeClear->setId("cmdKeyMinimizeClear");
 diff --git a/src/osdep/gui/ShowMessage.cpp b/src/osdep/gui/ShowMessage.cpp
-index de540394..752d5d37 100644
+index de7b5a31..b5889bc3 100644
 --- a/src/osdep/gui/ShowMessage.cpp
 +++ b/src/osdep/gui/ShowMessage.cpp
-@@ -153,7 +153,7 @@ static void InitShowMessage()
- 	if (gui_font == nullptr)
+@@ -174,10 +174,10 @@ static void InitShowMessage(const std::string& message)
  	{
  		TTF_Init();
--		gui_font = new gcn::SDLTrueTypeFont(prefix_with_application_directory_path("data/AmigaTopaz.ttf"), 15);
-+		gui_font = new gcn::SDLTrueTypeFont(prefix_with_application_directory_path("/usr/share/amiberry/data/AmigaTopaz.ttf"), 15);
- 		gcn::Widget::setGlobalFont(gui_font);
+ #ifdef USE_OPENGL
+-		gui_font = new gcn::ImageFont(prefix_with_data_path("fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
++		gui_font = new gcn::ImageFont(prefix_with_data_path("/usr/share/amiberry/data/fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+ 
+ #else
+-		gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("AmigaTopaz.ttf"), 15);
++		gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("/usr/share/amiberry/data/AmigaTopaz.ttf"), 15);
  		gui_font->setAntiAlias(false);
- 	}
+ #endif
+ 		gcn::Widget::setGlobalFont(gui_font);
 diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
-index 542241fd..ef768980 100644
+index 0970d2aa..ec4b33c1 100644
 --- a/src/osdep/gui/main_window.cpp
 +++ b/src/osdep/gui/main_window.cpp
-@@ -46,47 +46,47 @@ void target_startup_msg(const TCHAR* title, const TCHAR* msg)
+@@ -51,49 +51,49 @@ void target_startup_msg(const TCHAR* title, const TCHAR* msg)
  }
  
  ConfigCategory categories[] = {
--	{"About", "data/amigainfo.ico", nullptr, nullptr, InitPanelAbout, ExitPanelAbout, RefreshPanelAbout,
+-	{"About", "amigainfo.ico", nullptr, nullptr, InitPanelAbout, ExitPanelAbout, RefreshPanelAbout,
 +	{"About", "/usr/share/amiberry/data/amigainfo.ico", nullptr, nullptr, InitPanelAbout, ExitPanelAbout, RefreshPanelAbout,
  		HelpPanelAbout
  	},
--	{"Paths", "data/paths.ico", nullptr, nullptr, InitPanelPaths, ExitPanelPaths, RefreshPanelPaths, HelpPanelPaths},
--	{"Quickstart", "data/quickstart.ico", nullptr, nullptr, InitPanelQuickstart, ExitPanelQuickstart,
+-	{"Paths", "paths.ico", nullptr, nullptr, InitPanelPaths, ExitPanelPaths, RefreshPanelPaths, HelpPanelPaths},
+-	{"Quickstart", "quickstart.ico", nullptr, nullptr, InitPanelQuickstart, ExitPanelQuickstart,
 +	{"Paths", "/usr/share/amiberry/data/paths.ico", nullptr, nullptr, InitPanelPaths, ExitPanelPaths, RefreshPanelPaths, HelpPanelPaths},
 +	{"Quickstart", "/usr/share/amiberry/data/quickstart.ico", nullptr, nullptr, InitPanelQuickstart, ExitPanelQuickstart,
  		RefreshPanelQuickstart, HelpPanelQuickstart
  	},
--	{"Configurations", "data/file.ico", nullptr, nullptr, InitPanelConfig, ExitPanelConfig, RefreshPanelConfig,
+-	{"Configurations", "file.ico", nullptr, nullptr, InitPanelConfig, ExitPanelConfig, RefreshPanelConfig,
 +	{"Configurations", "/usr/share/amiberry/data/file.ico", nullptr, nullptr, InitPanelConfig, ExitPanelConfig, RefreshPanelConfig,
  		HelpPanelConfig
  	},
--	{"CPU and FPU", "data/cpu.ico", nullptr, nullptr, InitPanelCPU, ExitPanelCPU, RefreshPanelCPU, HelpPanelCPU},
--	{"Chipset", "data/cpu.ico", nullptr, nullptr, InitPanelChipset, ExitPanelChipset, RefreshPanelChipset,
+-	{"CPU and FPU", "cpu.ico", nullptr, nullptr, InitPanelCPU, ExitPanelCPU, RefreshPanelCPU, HelpPanelCPU},
+-	{"Chipset", "cpu.ico", nullptr, nullptr, InitPanelChipset, ExitPanelChipset, RefreshPanelChipset,
 +	{"CPU and FPU", "/usr/share/amiberry/data/cpu.ico", nullptr, nullptr, InitPanelCPU, ExitPanelCPU, RefreshPanelCPU, HelpPanelCPU},
 +	{"Chipset", "/usr/share/amiberry/data/cpu.ico", nullptr, nullptr, InitPanelChipset, ExitPanelChipset, RefreshPanelChipset,
  		HelpPanelChipset
  	},
--	{"ROM", "data/chip.ico", nullptr, nullptr, InitPanelROM, ExitPanelROM, RefreshPanelROM, HelpPanelROM},
--	{"RAM", "data/chip.ico", nullptr, nullptr, InitPanelRAM, ExitPanelRAM, RefreshPanelRAM, HelpPanelRAM},
--	{"Floppy drives", "data/35floppy.ico", nullptr, nullptr, InitPanelFloppy, ExitPanelFloppy, RefreshPanelFloppy,
+-	{"ROM", "chip.ico", nullptr, nullptr, InitPanelROM, ExitPanelROM, RefreshPanelROM, HelpPanelROM},
+-	{"RAM", "chip.ico", nullptr, nullptr, InitPanelRAM, ExitPanelRAM, RefreshPanelRAM, HelpPanelRAM},
+-	{"Floppy drives", "35floppy.ico", nullptr, nullptr, InitPanelFloppy, ExitPanelFloppy, RefreshPanelFloppy,
 +	{"ROM", "/usr/share/amiberry/data/chip.ico", nullptr, nullptr, InitPanelROM, ExitPanelROM, RefreshPanelROM, HelpPanelROM},
 +	{"RAM", "/usr/share/amiberry/data/chip.ico", nullptr, nullptr, InitPanelRAM, ExitPanelRAM, RefreshPanelRAM, HelpPanelRAM},
 +	{"Floppy drives", "/usr/share/amiberry/data/35floppy.ico", nullptr, nullptr, InitPanelFloppy, ExitPanelFloppy, RefreshPanelFloppy,
  		HelpPanelFloppy
  	},
--	{"Hard drives/CD", "data/drive.ico", nullptr, nullptr, InitPanelHD, ExitPanelHD, RefreshPanelHD, HelpPanelHD},
--	{"Expansions", "data/expansion.ico", nullptr, nullptr, InitPanelExpansions, ExitPanelExpansions,
+-	{"Hard drives/CD", "drive.ico", nullptr, nullptr, InitPanelHD, ExitPanelHD, RefreshPanelHD, HelpPanelHD},
+-	{"Expansions", "expansion.ico", nullptr, nullptr, InitPanelExpansions, ExitPanelExpansions,
 +	{"Hard drives/CD", "/usr/share/amiberry/data/drive.ico", nullptr, nullptr, InitPanelHD, ExitPanelHD, RefreshPanelHD, HelpPanelHD},
 +	{"Expansions", "/usr/share/amiberry/data/expansion.ico", nullptr, nullptr, InitPanelExpansions, ExitPanelExpansions,
  		RefreshPanelExpansions, HelpPanelExpansions},
--	{"RTG board", "data/expansion.ico", nullptr, nullptr, InitPanelRTG, ExitPanelRTG,
+-	{"RTG board", "expansion.ico", nullptr, nullptr, InitPanelRTG, ExitPanelRTG,
 +	{"RTG board", "/usr/share/amiberry/data/expansion.ico", nullptr, nullptr, InitPanelRTG, ExitPanelRTG,
  		RefreshPanelRTG, HelpPanelRTG
  	},
--	{"Hardware info", "data/expansion.ico", nullptr, nullptr, InitPanelHWInfo, ExitPanelHWInfo, RefreshPanelHWInfo, HelpPanelHWInfo},
--	{"Display", "data/screen.ico", nullptr, nullptr, InitPanelDisplay, ExitPanelDisplay, RefreshPanelDisplay,
+-	{"Hardware info", "expansion.ico", nullptr, nullptr, InitPanelHWInfo, ExitPanelHWInfo, RefreshPanelHWInfo, HelpPanelHWInfo},
+-	{"Display", "screen.ico", nullptr, nullptr, InitPanelDisplay, ExitPanelDisplay, RefreshPanelDisplay,
 +	{"Hardware info", "/usr/share/amiberry/data/expansion.ico", nullptr, nullptr, InitPanelHWInfo, ExitPanelHWInfo, RefreshPanelHWInfo, HelpPanelHWInfo},
 +	{"Display", "/usr/share/amiberry/data/screen.ico", nullptr, nullptr, InitPanelDisplay, ExitPanelDisplay, RefreshPanelDisplay,
  		HelpPanelDisplay
  	},
--	{"Sound", "data/sound.ico", nullptr, nullptr, InitPanelSound, ExitPanelSound, RefreshPanelSound, HelpPanelSound},
--	{"Input", "data/joystick.ico", nullptr, nullptr, InitPanelInput, ExitPanelInput, RefreshPanelInput, HelpPanelInput},
--	{"Custom controls", "data/controller.png", nullptr, nullptr, InitPanelCustom, ExitPanelCustom,
+-	{"Sound", "sound.ico", nullptr, nullptr, InitPanelSound, ExitPanelSound, RefreshPanelSound, HelpPanelSound},
+-	{"Input", "joystick.ico", nullptr, nullptr, InitPanelInput, ExitPanelInput, RefreshPanelInput, HelpPanelInput},
+-	{"IO Ports", "port.ico", nullptr, nullptr, InitPanelIO, ExitPanelIO, RefreshPanelIO, HelpPanelIO},
+-	{"Custom controls", "controller.png", nullptr, nullptr, InitPanelCustom, ExitPanelCustom,
 +	{"Sound", "/usr/share/amiberry/data/sound.ico", nullptr, nullptr, InitPanelSound, ExitPanelSound, RefreshPanelSound, HelpPanelSound},
 +	{"Input", "/usr/share/amiberry/data/joystick.ico", nullptr, nullptr, InitPanelInput, ExitPanelInput, RefreshPanelInput, HelpPanelInput},
++	{"IO Ports", "/usr/share/amiberry/data/port.ico", nullptr, nullptr, InitPanelIO, ExitPanelIO, RefreshPanelIO, HelpPanelIO},
 +	{"Custom controls", "/usr/share/amiberry/data/controller.png", nullptr, nullptr, InitPanelCustom, ExitPanelCustom,
  		RefreshPanelCustom, HelpPanelCustom
  	},
--	{"Miscellaneous", "data/misc.ico", nullptr, nullptr, InitPanelMisc, ExitPanelMisc, RefreshPanelMisc, HelpPanelMisc},
--	{ "Priority", "data/misc.ico", nullptr, nullptr, InitPanelPrio, ExitPanelPrio, RefreshPanelPrio, HelpPanelPrio},
--	{"Savestates", "data/savestate.png", nullptr, nullptr, InitPanelSavestate, ExitPanelSavestate,
+-	{"Disk swapper", "35floppy.ico", nullptr, nullptr, InitPanelDiskSwapper, ExitPanelDiskSwapper, RefreshPanelDiskSwapper, HelpPanelDiskSwapper},
+-	{"Miscellaneous", "misc.ico", nullptr, nullptr, InitPanelMisc, ExitPanelMisc, RefreshPanelMisc, HelpPanelMisc},
+-	{ "Priority", "misc.ico", nullptr, nullptr, InitPanelPrio, ExitPanelPrio, RefreshPanelPrio, HelpPanelPrio},
+-	{"Savestates", "savestate.png", nullptr, nullptr, InitPanelSavestate, ExitPanelSavestate,
++	{"Disk swapper", "/usr/share/amiberry/data/35floppy.ico", nullptr, nullptr, InitPanelDiskSwapper, ExitPanelDiskSwapper, RefreshPanelDiskSwapper, HelpPanelDiskSwapper},
 +	{"Miscellaneous", "/usr/share/amiberry/data/misc.ico", nullptr, nullptr, InitPanelMisc, ExitPanelMisc, RefreshPanelMisc, HelpPanelMisc},
 +	{ "Priority", "/usr/share/amiberry/data/misc.ico", nullptr, nullptr, InitPanelPrio, ExitPanelPrio, RefreshPanelPrio, HelpPanelPrio},
 +	{"Savestates", "/usr/share/amiberry/data/savestate.png", nullptr, nullptr, InitPanelSavestate, ExitPanelSavestate,
  		RefreshPanelSavestate, HelpPanelSavestate
  	},
  #ifdef ANDROID
--	{ "OnScreen",         "data/screen.ico",    NULL, NULL, InitPanelOnScreen,  ExitPanelOnScreen, RefreshPanelOnScreen,  HelpPanelOnScreen },
+-	{ "OnScreen",         "screen.ico",    NULL, NULL, InitPanelOnScreen,  ExitPanelOnScreen, RefreshPanelOnScreen,  HelpPanelOnScreen },
 +	{ "OnScreen",         "/usr/share/amiberry/data/screen.ico",    NULL, NULL, InitPanelOnScreen,  ExitPanelOnScreen, RefreshPanelOnScreen,  HelpPanelOnScreen },
  #endif
  	{nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}
  };
-@@ -262,7 +262,7 @@ void update_gui_screen()
+@@ -302,7 +302,7 @@ void update_gui_screen()
  #else
  void setup_cursor()
  {
--	cursor_surface = SDL_LoadBMP(prefix_with_application_directory_path("data/cursor.bmp").c_str());
-+	cursor_surface = SDL_LoadBMP(prefix_with_application_directory_path("/usr/share/amiberry/data/cursor.bmp").c_str());
+-	cursor_surface = SDL_LoadBMP(prefix_with_data_path("cursor.bmp").c_str());
++	cursor_surface = SDL_LoadBMP(prefix_with_data_path("/usr/share/amiberry/data/cursor.bmp").c_str());
  	if (!cursor_surface)
  	{
  		// Load failed. Log error.
-@@ -426,7 +426,7 @@ void amiberry_gui_init()
+@@ -473,7 +473,7 @@ void amiberry_gui_init()
  			GUI_HEIGHT,
  			flags);
  
--		auto* const icon_surface = IMG_Load("data/amiberry.png");
-+		auto* const icon_surface = IMG_Load("/usr/share/amiberry/data/amiberry.png");
+-		auto* const icon_surface = IMG_Load(prefix_with_data_path("amiberry.png").c_str());
++		auto* const icon_surface = IMG_Load(prefix_with_data_path("/usr/share/amiberry/data/amiberry.png").c_str());
  		if (icon_surface != nullptr)
  		{
  			SDL_SetWindowIcon(mon->sdl_window, icon_surface);
-@@ -1053,7 +1053,7 @@ void gui_widgets_init()
- 
+@@ -1218,9 +1218,9 @@ void gui_widgets_init()
  	try
  	{
--		gui_font = new gcn::SDLTrueTypeFont(prefix_with_application_directory_path("data/AmigaTopaz.ttf"), 15);
-+		gui_font = new gcn::SDLTrueTypeFont(prefix_with_application_directory_path("/usr/share/amiberry/data/AmigaTopaz.ttf"), 15);
+ #ifdef USE_OPENGL
+-		gui_font = new gcn::ImageFont(prefix_with_data_path("fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
++		gui_font = new gcn::ImageFont(prefix_with_data_path("/usr/share/amiberry/data/fixedfont.bmp"), " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
+ #else
+-		gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("AmigaTopaz.ttf"), 15);
++		gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path("/usr/share/amiberry/data/AmigaTopaz.ttf"), 15);
+ #endif
  	}
- 	catch (const std::exception& ex)
- 	{
+ 	catch (exception& ex)
diff --git a/package/amiberry/amiberry-0001-libcapsimage-path.patch b/package/amiberry/amiberry-0001-libcapsimage-path.patch
index 0dc21913fdfb24b04c01e8e096b6c28bdc3d4307..e31b4354d54b4bdf378188e838751fc01fa726e3 100644
--- a/package/amiberry/amiberry-0001-libcapsimage-path.patch
+++ b/package/amiberry/amiberry-0001-libcapsimage-path.patch
@@ -12,10 +12,10 @@ index 86c1ffb8..868d4595 100644
  	TCHAR path[MAX_DPATH];
  	_tcscpy(path, name);
 diff --git a/src/osdep/amiberry_gui.cpp b/src/osdep/amiberry_gui.cpp
-index 53eb287f..ab26f854 100644
+index 003a2a52..d9e5e1e7 100644
 --- a/src/osdep/amiberry_gui.cpp
 +++ b/src/osdep/amiberry_gui.cpp
-@@ -60,8 +60,8 @@ struct gui_msg gui_msglist[] = {
+@@ -64,8 +64,8 @@ struct gui_msg gui_msglist[] = {
    { NUMSG_ROMNEED,        "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." },
    { NUMSG_EXPROMNEED,     "One of the following expansion boot ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." },
    { NUMSG_NOMEMORY,       "Out of memory or too much Z3 autoconfig space configured." },
diff --git a/package/amiberry/amiberry-0002-recalbox-path.patch b/package/amiberry/amiberry-0002-recalbox-path.patch
index 9c3549c6845a26bd2e5ffdf27a74ef3b3c94fa7e..9c7253e0a7d1f694e1b321d0dc156930c86704d4 100644
--- a/package/amiberry/amiberry-0002-recalbox-path.patch
+++ b/package/amiberry/amiberry-0002-recalbox-path.patch
@@ -1,44 +1,49 @@
 diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
-index 7ff50641..88f84b72 100644
+index f6f7c988..48211de1 100644
 --- a/src/osdep/amiberry.cpp
 +++ b/src/osdep/amiberry.cpp
-@@ -2221,7 +2221,7 @@ void get_data_path(char* out, int size)
+@@ -2350,8 +2350,7 @@ void get_data_path(char* out, int size)
+ 
  void get_saveimage_path(char* out, int size, int dir)
  {
- 	strncpy(out, start_path_data, size - 1);
--	strncat(out, "/savestates/", size - 1);
-+	strncat(out, "/recalbox/share/saves/amiga/", size - 1);
+-	fix_trailing(saveimage_dir);
+-	strncpy(out, saveimage_dir, size - 1);
++	strncpy(out, "/recalbox/share/saves/amiga/", size - 1);
  }
  
  void get_configuration_path(char* out, int size)
-@@ -2296,13 +2296,13 @@ void get_rp9_path(char* out, int size)
+@@ -2458,8 +2457,7 @@ void get_rp9_path(char* out, int size)
+ 
  void get_savestate_path(char* out, int size)
  {
- 	strncpy(out, start_path_data, size - 1);
--	strncat(out, "/savestates/", size - 1);
-+	strncat(out, "/recalbox/share/saves/amiga/", size - 1);
+-	fix_trailing(savestate_dir);
+-	strncpy(out, savestate_dir, size - 1);
++	strncpy(out, "/recalbox/share/saves/amiga/", size - 1);
  }
  
+ void fetch_ripperpath(TCHAR* out, int size)
+@@ -2482,8 +2480,7 @@ void get_nvram_path(TCHAR *out, int size)
+ 
  void get_screenshot_path(char* out, int size)
  {
- 	strncpy(out, start_path_data, size - 1);
--	strncat(out, "/screenshots/", size - 1);
-+	strncat(out, "/recalbox/share/screenshots/", size - 1);
+-	fix_trailing(screenshot_dir);
+-	strncpy(out, screenshot_dir, size - 1);
++	strncpy(out, "/recalbox/share/screenshots/", size - 1);
  }
  
  int target_cfgfile_load(struct uae_prefs* p, const char* filename, int type, int isdefault)
-@@ -2716,8 +2716,8 @@ void load_amiberry_settings(void)
- 	char path[MAX_DPATH];
+@@ -3234,8 +3231,8 @@ static void init_amiberry_paths(void)
+ {
  	strncpy(current_dir, start_path_data, MAX_DPATH - 1);
  	snprintf(config_path, MAX_DPATH, "%s/conf/", start_path_data);
 -	snprintf(controllers_path, MAX_DPATH, "%s/controllers/", start_path_data);
 -	snprintf(retroarch_file, MAX_DPATH, "%s/conf/retroarch.cfg", start_path_data);
 +	snprintf(controllers_path, MAX_DPATH, "%s/conf/", start_path_data);
 +	snprintf(retroarch_file, MAX_DPATH, "/recalbox/share/system/configs/retroarch/retroarchcustom.cfg", start_path_data);
+ 	snprintf(whdboot_path, MAX_DPATH, "%s/whdboot/", start_path_data);
  	snprintf(logfile_path, MAX_DPATH, "%s/amiberry.log", start_path_data);
  
- #ifdef ANDROID
-@@ -2731,9 +2731,9 @@ void load_amiberry_settings(void)
+@@ -3250,9 +3247,9 @@ static void init_amiberry_paths(void)
  	else
  		snprintf(rom_path, MAX_DPATH, "%s/kickstarts/", start_path_data);
  #else
@@ -47,10 +52,10 @@ index 7ff50641..88f84b72 100644
  #endif
 -	snprintf(rp9_path, MAX_DPATH, "%s/rp9/", start_path_data);
 +	snprintf(rp9_path, MAX_DPATH, "%s/conf/", start_path_data);
- 	snprintf(path, MAX_DPATH, "%s/conf/amiberry.conf", start_path_data);
- 	snprintf(floppy_sounds_dir, MAX_DPATH, "%s/data/floppy_sounds/", start_path_data);
- 
-@@ -2968,13 +2968,12 @@ int main(int argc, char* argv[])
+ #ifdef __MACH__
+ 	// Open amiberry.conf from Application Data directory
+ 	const std::string macos_home_directory = getenv("HOME");
+@@ -3415,9 +3412,8 @@ int main(int argc, char* argv[])
  	}
  	else
  	{
@@ -59,10 +64,15 @@ index 7ff50641..88f84b72 100644
  	}
 -
  	rename_old_adfdir();
- 	load_amiberry_settings();
+ 	init_amiberry_paths();
+ 	// Parse command line to get possibly set amiberry_config.
+@@ -3438,8 +3434,7 @@ int main(int argc, char* argv[])
+ 		abort();
+ 	}
  
--	snprintf(savestate_fname, sizeof savestate_fname, "%s/savestates/default.ads", start_path_data);
-+	snprintf(savestate_fname, sizeof savestate_fname, "/recalbox/share/saves/amiga/default.ads", start_path_data);
+-	fix_trailing(savestate_dir);
+-	snprintf(savestate_fname, sizeof savestate_fname, "%s/default.ads", savestate_dir);
++	snprintf(savestate_fname, sizeof savestate_fname, "/recalbox/share/saves/amiga/default.ads", savestate_dir);
  	logging_init();
  
  	memset(&action, 0, sizeof action);
diff --git a/package/amiberry/amiberry-0003-compilation-options.patch b/package/amiberry/amiberry-0003-compilation-options.patch
index c68d5949e6af2c7b197e7b97e4878e54da982017..e4834f04d93787004deb613efded16c3de858c51 100644
--- a/package/amiberry/amiberry-0003-compilation-options.patch
+++ b/package/amiberry/amiberry-0003-compilation-options.patch
@@ -1,17 +1,18 @@
 diff --git a/Makefile b/Makefile
-index 78740d2f..429672f9 100644
+index cac7ec2c..248e7c9e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -8,9 +8,9 @@ SDL_CONFIG ?= sdl2-config
+@@ -21,10 +21,10 @@ SDL_CONFIG ?= sdl2-config
  export SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
  export SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
  
--CPPFLAGS = -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -DAMIBERRY -D_FILE_OFFSET_BITS=64
+-CPPFLAGS = -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -Isrc/floppybridge -DAMIBERRY -D_FILE_OFFSET_BITS=64
 -CFLAGS=-pipe -Wno-shift-overflow -Wno-narrowing
--LDFLAGS = $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib -fuse-ld=gold -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lpthread -lz -lpng -lrt -lFLAC -lmpg123 -ldl -lmpeg2convert -lmpeg2
-+CPPFLAGS += -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -DAMIBERRY -D_FILE_OFFSET_BITS=64
-+CFLAGS += -pipe -Wno-shift-overflow -Wno-narrowing
-+LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lpthread -lz -lpng -lrt -lFLAC -lmpg123 -ldl -lmpeg2convert -lmpeg2
- 
- ifndef DEBUG
- 	CFLAGS += -O3
++CPPFLAGS += -MD -MT $@ -MF $(@:%.o=%.d) $(SDL_CFLAGS) -Iexternal/libguisan/include -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include -Isrc/archivers -Isrc/floppybridge -DAMIBERRY -D_FILE_OFFSET_BITS=64
++CFLAGS +=-pipe -Wno-shift-overflow -Wno-narrowing
+ USE_LD ?= gold
+-LDFLAGS = $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib
++LDFLAGS += $(SDL_LDFLAGS) -lSDL2_image -lSDL2_ttf -lguisan -Lexternal/libguisan/lib
+ ifneq ($(strip $(USE_LD)),)
+ 	LDFLAGS += -fuse-ld=$(USE_LD)
+ endif
diff --git a/package/amiberry/amiberry-0005-add-rpi4-64bits-support.patch b/package/amiberry/amiberry-0004-add-rpi4-64bits-support.patch
similarity index 62%
rename from package/amiberry/amiberry-0005-add-rpi4-64bits-support.patch
rename to package/amiberry/amiberry-0004-add-rpi4-64bits-support.patch
index 527c457945b80751ccd50f6ce402217b4a40a9c3..4f9cdc5cda8ad627858df2f89bb5c78b357c5e3c 100644
--- a/package/amiberry/amiberry-0005-add-rpi4-64bits-support.patch
+++ b/package/amiberry/amiberry-0004-add-rpi4-64bits-support.patch
@@ -1,19 +1,19 @@
 diff --git a/Makefile b/Makefile
-index 429672f9..cbc1697e 100644
+index 248e7c9e..80ab1d14 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -45,8 +45,13 @@ endif
+@@ -77,8 +77,13 @@ endif
  
  # Raspberry Pi 4 CPU flags
  ifneq (,$(findstring rpi4,$(PLATFORM)))
--    CPUFLAGS = -mcpu=cortex-a72 -mfpu=neon-fp-armv8
+-	CPUFLAGS = -mcpu=cortex-a72 -mfpu=neon-fp-armv8
 +    CPUFLAGS = -mcpu=cortex-a72
 +# Raspberry Pi 4 32bits CPU flags
 +ifeq (,$(findstring 64,$(PLATFORM)))
 +	CPUFLAGS += -mfpu=neon-fp-armv8
-+endif
  endif
++endif
 +
- #
- # DispmanX Common flags (RPI-specific)
- #
+ 
+ # Mac OS X M1 CPU flags
+ ifneq (,$(findstring osx-m1,$(PLATFORM)))
diff --git a/package/amiberry/amiberry-0004-load-mouse-maps.patch b/package/amiberry/amiberry-0004-load-mouse-maps.patch
deleted file mode 100644
index 2794a311905c8875721c0158c1527344193dec31..0000000000000000000000000000000000000000
--- a/package/amiberry/amiberry-0004-load-mouse-maps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/cfgfile.cpp b/src/cfgfile.cpp
-index ee4d0e56..6e0317a4 100644
---- a/src/cfgfile.cpp
-+++ b/src/cfgfile.cpp
-@@ -4008,6 +4008,10 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
- 		return 1;
- 	if (cfgfile_strval(option, value, _T("joyport3submode"), &p->jports[3].submode, joyportsubmodes_lightpen, 0))
- 		return 1;
-+  if (cfgfile_strval(option, value, _T("joyport0mousemap"), &p->jports[0].mousemap, mousemaps, 2))
-+    return 1;
-+  if (cfgfile_strval(option, value, _T("joyport1mousemap"), &p->jports[1].mousemap, mousemaps, 2))
-+    return 1;
- 	if (cfgfile_strval(option, value, _T("joyport0autofire"), &p->jports[0].autofire, joyaf, 0))
- 		return 1;
- 	if (cfgfile_strval(option, value, _T("joyport1autofire"), &p->jports[1].autofire, joyaf, 0))
diff --git a/package/amiberry/amiberry-0005-add-s922x-platform.patch b/package/amiberry/amiberry-0005-add-s922x-platform.patch
new file mode 100644
index 0000000000000000000000000000000000000000..18345d9625b079e38c31f16c9450adfc1dbc4452
--- /dev/null
+++ b/package/amiberry/amiberry-0005-add-s922x-platform.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile b/Makefile
+index 80ab1d14..c53ab7e9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -157,6 +157,13 @@ else ifeq ($(PLATFORM),n2)
+ 	CPPFLAGS += $(CPPFLAGS64) -DUSE_RENDER_THREAD
+ 	AARCH64 = 1
+ 
++# Odroid Go Ultra - N2+ (SDL2 64-bit)
++else ifeq ($(PLATFORM),s922x)
++	CPUFLAGS = -mcpu=cortex-a73.cortex-a53
++	CPPFLAGS += $(CPPFLAGS64) -DUSE_RENDER_THREAD
++	ASCPUFLAGS = -mcpu=cortex-a73
++	AARCH64 = 1
++
+ # Raspberry Pi 3 (SDL2 64-bit)
+ else ifeq ($(PLATFORM),rpi3-64-sdl2)
+ 	CPUFLAGS = -mcpu=cortex-a53
+@@ -585,10 +592,14 @@ endif
+ 
+ USE_JIT=1
+ 
++ifeq ($(ASCPUFLAGS),)
++	ASCPUFLAGS = $(CPUFLAGS)
++endif
++
+ ifdef AARCH64
+ OBJS += src/osdep/aarch64_helper.o
+ src/osdep/aarch64_helper.o: src/osdep/aarch64_helper.s
+-	$(AS) $(CPUFLAGS) -o src/osdep/aarch64_helper.o -c src/osdep/aarch64_helper.s
++	$(AS) $(ASCPUFLAGS) -o src/osdep/aarch64_helper.o -c src/osdep/aarch64_helper.s
+ else ifeq ($(PLATFORM),$(filter $(PLATFORM),rpi1 rpi1-sdl2))
+ OBJS += src/osdep/arm_helper.o
+ src/osdep/arm_helper.o: src/osdep/arm_helper.s
diff --git a/package/amiberry/amiberry.mk b/package/amiberry/amiberry.mk
index 21aaf936f2fa4fb950c037e39c329e058fb7d65f..9d0d7f3f7e7bc3da71ec0bab7462134abbc03804 100644
--- a/package/amiberry/amiberry.mk
+++ b/package/amiberry/amiberry.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AMIBERRY_VERSION = v4.1.6
+AMIBERRY_VERSION = v5.4
 AMIBERRY_SITE = $(call gitlab,recalbox,packages/standalone/amiberry,$(AMIBERRY_VERSION))
 AMIBERRY_LICENSE = GPL-3.0
 AMIBERRY_LICENSE_FILES = COPYING
@@ -25,7 +25,7 @@ AMIBERRY_PLATFORM=rpi1-sdl2
 else ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_ODROIDXU4),y)
 AMIBERRY_PLATFORM=xu4
 else ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_ODROIDGO2),y)
-AMIBERRY_PLATFORM=go-advance
+AMIBERRY_PLATFORM=oga
 else ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_RG353X),y)
 AMIBERRY_PLATFORM=a64
 endif
@@ -42,7 +42,7 @@ define AMIBERRY_BUILD_CMDS
 		-C $(@D) \
 		-f Makefile \
 		PLATFORM="$(AMIBERRY_PLATFORM)" \
-		SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl2-config"
+		SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl2-config" USE_LD=""
 endef
 
 define AMIBERRY_INSTALL_TARGET_CMDS