diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile
index cd82a846f62d..a3c37e28d0a8 100644
--- a/emulators/ares/Makefile
+++ b/emulators/ares/Makefile
@@ -1,198 +1,205 @@
 PORTNAME=	ares
 DISTVERSION=	139.20240809
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Multi-system emulator
-WWW=		https://github.com/ares-emulator/ares
+WWW=		https://ares-emu.net
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \
 		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ares-emulator
 GH_TAGNAME=	a76847d
 USE_GNOME=	gtksourceview3
 USE_XORG=	x11 xext xrandr
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	compiler=${CC} \
 		cores= \
 		hiro=gtk3-se \
 		local=false \
 		lto=false \
 		prefix=${PREFIX} \
 		ruby=video.none \
 		sdl2=false \
 		symbols=false \
 		threaded=true
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DEBUG DOCS NVIDIA OPENMP SHADER
 OPTIONS_DEFAULT=	A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \
 			NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \
 			SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO
 OPTIONS_GROUP=		AUDIO CORES INPUT VIDEO
 OPTIONS_GROUP_AUDIO=	ALSA AO OPENAL OSS PULSEAUDIO SDLAUDIO
 OPTIONS_GROUP_CORES=	A26 CV FC GB GBA MD MS MSX MYVISION N64 NG NGP PCE PS1 \
 			SFC SG SPEC WS
 OPTIONS_GROUP_INPUT=	SDLINPUT UDEV UHID XLIB
 OPTIONS_GROUP_VIDEO=	GLX XVIDEO
 OPTIONS_SINGLE=		PROFILE
 OPTIONS_SINGLE_PROFILE=	ACCURACY PERFORMANCE
 
 A26_DESC=		Atari 2600
 ACCURACY_DESC=		Slower but more accurate
 CV_DESC=		ColecoVision
 FC_DESC=		NES / Famicom
 GBA_DESC=		Game Boy Advance
 GB_DESC=		Game Boy
 MD_DESC=		Mega Drive / Genesis
 MSX_DESC=		MSX
 MS_DESC=		Master System / Mark III
 MYVISION_DESC=		My Vision
 N64_DESC=		Nintendo 64
 NGP_DESC=		Neo Geo Pocket
 NG_DESC=		Neo Geo (AES/MVS)
 NVIDIA_DESC=		Apply shader cache workaround (implies ${NVIDIA_IMPLIES})
 PCE_DESC=		PC-Engine / TurboGrafx
 PERFORMANCE_DESC=	Faster but less accurate
 PROFILE_DESC=
 PS1_DESC=		PlayStation
 SDLAUDIO_DESC=		${SDL_DESC}
 SDLINPUT_DESC=		${SDL_DESC}
 SFC_DESC=		SNES / Super Famicom
 SG_DESC=		SG-1000
 SHADER_DESC=		Build with shader support
 SPEC_DESC=		ZX Spectrum
 UDEV_DESC=		UDEV input support
 UHID_DESC=		UHID input support
 VIDEO_DESC=
 WS_DESC=		WonderSwan
 XLIB_DESC=		XLIB input support
 
 A26_MAKE_ARGS=		cores+=a26
 
 ACCURACY_MAKE_ARGS=	profile=accuracy
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		ruby+=audio.alsa
 
 AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_MAKE_ARGS=		ruby+=audio.ao
 
 CV_MAKE_ARGS=		cores+=cv
 
 DEBUG_MAKE_ARGS=	build=debug
 DEBUG_MAKE_ARGS_OFF=	build=release
 
 FC_MAKE_ARGS=		cores+=fc
 
 GBA_MAKE_ARGS=		cores+=gba
 
 GB_MAKE_ARGS=		cores+=gb
 
 GLX_USES=		gl
 GLX_USE=		GL=gl
 GLX_MAKE_ARGS=		ruby+=video.glx
 
 MD_MAKE_ARGS=		cores+=md
 
 MSX_MAKE_ARGS=		cores+=msx
 
 MS_MAKE_ARGS=		cores+=ms
 
 MYVISION_MAKE_ARGS=	cores+=myvision
 
 N64_RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 N64_MAKE_ARGS=		cores+=n64 \
 			vulkan=true
 N64_MAKE_ARGS_OFF=	vulkan=false
 N64_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp
 
 NGP_MAKE_ARGS=		cores+=ngp
 
 NG_MAKE_ARGS=		cores+=ng
 
 NVIDIA_IMPLIES=		N64
 NVIDIA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp
 
 OPENAL_USES=		openal
 OPENAL_MAKE_ARGS=	ruby+=audio.openal
 
 OPENMP_MAKE_ARGS=	openmp=true
 OPENMP_MAKE_ARGS_OFF=	openmp=false
 
 OSS_MAKE_ARGS=		ruby+=audio.oss
 
 PCE_MAKE_ARGS=		cores+=pce
 
 PERFORMANCE_MAKE_ARGS=	profile=performance
 
 PS1_MAKE_ARGS=		cores+=ps1
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio \
 			libpulse.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS=	ruby+=audio.pulseaudio \
 			ruby+=audio.pulseaudiosimple
 
 SDLAUDIO_USES=		sdl
 SDLAUDIO_USE=		SDL=sdl2
 SDLAUDIO_MAKE_ARGS=	ruby+=audio.sdl \
 			sdl2=true
 
 SDLINPUT_USES=		sdl
 SDLINPUT_USE=		SDL=sdl2
 SDLINPUT_MAKE_ARGS=	ruby+=input.sdl \
 			sdl2=true
 
 SFC_MAKE_ARGS=		cores+=sfc
 
 SG_MAKE_ARGS=		cores+=sg
 
 SHADER_RUN_DEPENDS=	${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang
 SHADER_MAKE_ARGS=	librashader=true
 SHADER_MAKE_ARGS_OFF=	librashader=false
 SHADER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-desktop-ui_desktop-ui.cpp
 
 SPEC_MAKE_ARGS=		cores+=spec
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_MAKE_ARGS=		ruby+=input.udev
 
 UHID_MAKE_ARGS=		ruby+=input.uhid
 
 WS_MAKE_ARGS=		cores+=ws
 
 XLIB_MAKE_ARGS=		ruby+=input.xlib
 
 XVIDEO_USE=		XORG=xv
 XVIDEO_MAKE_ARGS=	ruby+=video.xvideo
 
 _SHADERS=		share/libretro/shaders/shaders_slang
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENAL} && ${ARCH} == "i386"
+LLD_UNSAFE=	yes
+.endif
+
 post-patch-SHADER-on:
 	${REINPLACE_CMD} 's|@@SHADERS@@|${LOCALBASE}/${_SHADERS}/|g' \
 		${WRKSRC}/desktop-ui/desktop-ui.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/desktop-ui/out/ares \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/desktop-ui/resource/ares.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
 	${INSTALL_DATA} ${WRKSRC}/desktop-ui/resource/ares.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
 	${MKDIR} ${STAGEDIR}${DATADIR}/Database
 	(cd ${WRKSRC}/mia/Database && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/Database)
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/ares/files/patch-nall_GNUmakefile b/emulators/ares/files/patch-nall_GNUmakefile
index 2f3d96d9db09..1d1551df60f3 100644
--- a/emulators/ares/files/patch-nall_GNUmakefile
+++ b/emulators/ares/files/patch-nall_GNUmakefile
@@ -1,29 +1,38 @@
 --- nall/GNUmakefile.orig	2024-08-14 12:07:36 UTC
 +++ nall/GNUmakefile
+@@ -102,7 +102,7 @@ else
+ else
+   machine_opt := $(if $(findstring clang,$(compiler)),-print-target-triple,-dumpmachine)
+   machine_str := $(shell $(compiler) $(machine_opt))
+-  ifneq ($(filter i686-%,$(machine_str)),)
++  ifneq ($(filter i386-% i486-% i586-% i686-%,$(machine_str)),)
+     machine := x86
+   else ifneq ($(filter amd64-% x86_64-%,$(machine_str)),)
+     machine := amd64
 @@ -169,8 +169,6 @@ ifeq ($(build),debug)
    lto = false
    ifeq ($(cl),true)
      flags += -Od
 -  else
 -    flags += -Og
    endif
    flags += -DBUILD_DEBUG
  else ifeq ($(build),stable)
 @@ -178,7 +176,7 @@ else ifeq ($(build),release)
  else ifeq ($(build),minified)
    flags += -Os -DBUILD_MINIFIED
  else ifeq ($(build),release)
 -  flags += -O2 -DBUILD_RELEASE
 +  flags += -DBUILD_RELEASE
  else ifeq ($(build),optimized)
    ifeq ($(cl),true)
      flags += -O2
 @@ -323,8 +321,6 @@ ifeq ($(platform),bsd)
  
  # bsd settings
  ifeq ($(platform),bsd)
 -  flags   += -I/usr/local/include
 -  options += -Wl,-rpath=/usr/local/lib
    options += -lstdc++ -lm
  endif
  
diff --git a/emulators/ares/pkg-descr b/emulators/ares/pkg-descr
index b01a978f7b90..1d1df5876394 100644
--- a/emulators/ares/pkg-descr
+++ b/emulators/ares/pkg-descr
@@ -1,20 +1,20 @@
 ares is an open-source multi-system emulator with a focus on accuracy and
 preservation. It is a descendant of the emulators higan and bsnes. It's source
 code is structured to be maximally readable and self-documenting.
 
 ares supports the following systems: Arcade, WonderSwan, WonderSwan Color,
 Pocket Challenge V2, ColecoVision, PC-Engine / TurboGrafx, SuperGrafx, My
 Vision, NES / Famicom, Famicom Disk System, SNES / Super Famicom, Satellaview,
 Sufami Turbo, Nintendo 64, Nintendo 64DD, Game Boy, Game Boy Color, Game Boy
 Advance, SG-1000, Master System / Mark III, Mega Drive / Genesis, Mega CD, 32X,
 Game Gear, Neo Geo Pocket, Neo Geo Pocket Color
 
 ares has experimental support for the following systems: Atari 2600, MSX, MSX2,
 PC-Engine CD / TurboGrafx CD, ZX Spectrum, Neo Geo (AES/MVS), PlayStation
 
 ares has all the features one would expect from a great emulator system: native
 multi-platform UI, dynamic rate control, save states, run-ahead, rewind and
 fast-forward, pixel shaders, color correction, input multi-mapping, debugger
 
-ares uses librashader for it's pixel shader engine. This means it is highly
+ares uses librashader for its pixel shader engine. This means it is highly
 compatible with existing slang shaders, e.g. the slang-shaders from libretro.