diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0b884e936e72222092d75c8e72cd52e1df358884..7aca1349fac4c68c12b2920384a02074d0739a9b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -6,15 +6,19 @@ as release notes for end user on a Recalbox upgrade.
 
 ## Version 8.1-Electron
 ### News
+
 - Add delete game options
 - Add core libretro vitaquake2 for x64
 
 ### Improvements
+
 - Bump EmuSCV to fix zipped games load
+- Bump libretro mame2015
 
 ### Fixes
 - Add CRT check menu footer
 - Fix es_input for 8bitdo SN30Pro+ and Xbox One S Controller Model 1708
+- Fix libretro mame2015 for OGA/OGS
 
 
 ## Version 8.0.2-Electron
diff --git a/package/libretro-mame2015/libretro-mame2015.mk b/package/libretro-mame2015/libretro-mame2015.mk
index 5eac353a23b8fb2a4d82911f122b89de09d0d3b5..3912543d9b8a79423e34538c23c3765f7ad86ef7 100644
--- a/package/libretro-mame2015/libretro-mame2015.mk
+++ b/package/libretro-mame2015/libretro-mame2015.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-LIBRETRO_MAME2015_VERSION = 969bf4a4376866f046c885237ee6aee37fe04bf4
+#Commit version of 19/01/2022
+LIBRETRO_MAME2015_VERSION = e6a7aa4d53726e61498f68d6b8e2c092a2169fa2
 LIBRETRO_MAME2015_SITE = $(call github,libretro,mame2015-libretro,$(LIBRETRO_MAME2015_VERSION))
 LIBRETRO_MAME2015_LICENSE = MAME
 LIBRETRO_MAME2015_NON_COMMERCIAL = y
@@ -19,9 +20,16 @@ LIBRETRO_MAME2015_CXXFLAGSO = $(COMPILER_COMMONS_CXXFLAGS_SO)
 LIBRETRO_MAME2015_LDFLAGS = $(COMPILER_COMMONS_LDFLAGS_SO)
 endif
 
+ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_ODROIDGO2),y)
+LIBRETRO_MAME2015_OPTS = PTR64=1
+LIBRETRO_MAME2015_AARCH64OPTS = -DSDLMAME_NO64BITIO -DIOS -DSDLMAME_ARM -DHAVE_POSIX_MEMALIGN
+else
+LIBRETRO_MAME2015_AARCH64OPTS =
+endif
+
 define LIBRETRO_MAME2015_BUILD_CMDS
-	$(SED) "s|^CONLYFLAGS =|CONLYFLAGS = $(LIBRETRO_MAME2015_CFLAGSO)|g" $(@D)/Makefile
-	$(SED) "s|^CPPONLYFLAGS =|CPPONLYFLAGS = $(LIBRETRO_MAME2015_CXXFLAGSO)|g" $(@D)/Makefile
+	$(SED) "s|^CONLYFLAGS =|CONLYFLAGS = $(LIBRETRO_MAME2015_CFLAGSO) $(LIBRETRO_MAME2015_AARCH64OPTS)|g" $(@D)/Makefile
+	$(SED) "s|^CPPONLYFLAGS =|CPPONLYFLAGS = $(LIBRETRO_MAME2015_CXXFLAGSO) $(LIBRETRO_MAME2015_AARCH64OPTS)|g" $(@D)/Makefile
 	$(SED) "s|^LDFLAGS =|LDFLAGS = $(LIBRETRO_MAME2015_LDFLAGS) -lm|g" $(@D)/Makefile
 	$(SED) "s|-O2|-O3|g" $(@D)/Makefile
 	$(SED) "s|-O0|-O3|g" $(@D)/src/lib/lib.mak