diff --git a/srcpkgs/OpenCPN/patches/actually-set-arch.patch b/srcpkgs/OpenCPN/patches/actually-set-arch.patch
deleted file mode 100644
index d152c409288..00000000000
--- a/srcpkgs/OpenCPN/patches/actually-set-arch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/cmake/GetArch.cmake	2020-07-15 20:02:29.000000000 +0200
-+++ b/cmake/GetArch.cmake	2020-07-15 20:02:29.000000000 +0200
-@@ -14,6 +14,25 @@
-     # default
-     set (ARCH "i386")
-     set (LIB_INSTALL_DIR "lib")
-+    IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+      IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "aarch64")
-+      ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "armhf")
-+      ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+    ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "ppc*" OR CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc*")
-+      IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "ppc64")
-+      ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "powerpc")
-+      ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+    ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+      IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "x86_64")
-+      ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+        SET (ARCH "i386")
-+      ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-+    ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-     if (EXISTS /etc/debian_version)
-       set (PACKAGE_FORMAT "DEB")
-       set (PACKAGE_RECS "xcalib,xdg-utils")
diff --git a/srcpkgs/OpenCPN/patches/musl.patch b/srcpkgs/OpenCPN/patches/musl.patch
index 75923e019b2..517186873d0 100644
--- a/srcpkgs/OpenCPN/patches/musl.patch
+++ b/srcpkgs/OpenCPN/patches/musl.patch
@@ -1,30 +1,35 @@
---- a/include/zeroconf-detail.hpp	2020-07-15 20:02:29.000000000 +0200
-+++ b/include/zeroconf-detail.hpp	2020-07-15 20:02:29.000000000 +0200
-@@ -20,9 +20,7 @@
- #define WIN32_LEAN_AND_MEAN
- #include <winsock2.h>
- #else
--    #ifndef __WXOSX__
--        #include <error.h>
--    #else    
-+    #ifdef __WXOSX__
-         #include <mach/error.h> 
- #endif
+https://git.alpinelinux.org/aports/plain/community/opencpn/gcc12.patch
+
+diff --git a/include/zeroconf-detail.hpp b/include/zeroconf-detail.hpp
+index 60ae125..3e7607a 100644
+--- a/include/zeroconf-detail.hpp
++++ b/include/zeroconf-detail.hpp
+@@ -11,6 +11,9 @@
+ #include <vector>
+ #include <memory>
+ #include <chrono>
++#include <ctime>
++
++#include <sys/select.h>
  
-@@ -424,4 +422,4 @@
-     }
- }
+ #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+ #define WIN32
+@@ -385,4 +388,4 @@ inline bool Resolve(const std::string& serviceName, time_t scanTime,
+ }  // namespace Detail
+ }  // namespace Zeroconf
  
--#endif // ZEROCONF_DETAIL_HPP
+-#endif  // ZEROCONF_DETAIL_HPP
 \ No newline at end of file
-+#endif // ZEROCONF_DETAIL_HPP
---- a/include/zeroconf-detail.hpp	2020-07-25 18:05:08.714098962 +0200
-+++ b/include/zeroconf-detail.hpp	2020-07-25 18:05:08.714098962 +0200
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
- #include <netinet/in.h>
++#endif  // ZEROCONF_DETAIL_HPP
+diff --git a/src/mDNS_service.cpp b/src/mDNS_service.cpp
+index c8c7877..3fbd7ea 100644
+--- a/src/mDNS_service.cpp
++++ b/src/mDNS_service.cpp
+@@ -35,6 +35,7 @@
  #endif
  
+ #include <stdio.h>
++#include <sys/select.h>
+ 
+ #include <errno.h>
+ #include <signal.h>
diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template
index ee67dbaff01..5f3a096c06d 100644
--- a/srcpkgs/OpenCPN/template
+++ b/srcpkgs/OpenCPN/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenCPN'
 pkgname=OpenCPN
-version=5.2.0
-revision=2
+version=5.8.4
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
@@ -10,16 +10,17 @@ configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
  -DOCPN_USE_BUNDLED_LIBS=OFF"
 hostmakedepends="gettext pkg-config"
 makedepends="gtk+3-devel libcurl-devel portaudio-devel tinyxml-devel
- wxWidgets-gtk3-devel $(vopt_if exif 'libexif-devel') glu-devel
- $(vopt_if libarchive 'libarchive-devel' 'libunarr-devel') $(vopt_if lzma 'liblzma-devel')"
+ wxWidgets-gtk3-devel glu-devel glew-devel rapidjson gtest-devel
+ $(vopt_if libarchive 'libarchive-devel' 'libunarr-devel')
+ $(vopt_if exif 'libexif-devel') $(vopt_if lzma 'liblzma-devel')"
 depends="gpsd hicolor-icon-theme OpenCPN-tcdata-${version}_${revision}
  OpenCPN-gshhs-crude"
 short_desc="Concise ChartPlotter/Navigator"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-exception-3.1, JasPer-2.0, BSD-3-Clause, SGI-B-2.0"
 homepage="https://opencpn.org/"
-distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
-checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7
+distfiles="https://github.com/OpenCPN/OpenCPN/archive/Release_${version}.tar.gz"
+checksum=7552726e5afce5eb401e307beedd8f3aa2c66725602fc27ab3ad1845f40b87a0
 
 build_options="lzma libarchive exif crashreport"
 build_options_default="lzma libarchive exif"
@@ -33,7 +34,12 @@ case $XBPS_TARGET_MACHINE in
 	*) build_options_default+=" crashreport";;
 esac
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" -DOCPN_BUILD_TEST=OFF"
+fi
+
 CFLAGS="-fcommon"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_install() {
 	vlicense libs/glshim/LICENSE LICENSE.glshim