diff --git a/package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch b/package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch
index ec876a6852..9c8123f3f1 100644
--- a/package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch
+++ b/package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch
@@ -8,6 +8,8 @@ When cross-compiling, RUST_TARGET is not always equal to host_triplet
 through RUST_TARGET environment variable
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Bernd: rebased for version 8.0.4]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  configure.ac | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
@@ -16,7 +18,7 @@ diff --git a/configure.ac b/configure.ac
 index 32c230209..7d7c9373f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2489,7 +2489,12 @@ fi
+@@ -2146,7 +2146,12 @@ fi
      have_rust_vendor="no"
  
      if test "x$cross_compiling" = "xyes"; then
diff --git a/package/suricata/0002-configure.ac-fix-static-build.patch b/package/suricata/0002-configure.ac-fix-static-build.patch
index fc5384a114..9e09aa3005 100644
--- a/package/suricata/0002-configure.ac-fix-static-build.patch
+++ b/package/suricata/0002-configure.ac-fix-static-build.patch
@@ -21,6 +21,8 @@ Fixes:
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Upstream: https://redmine.openinfosecfoundation.org/issues/7008
+[Bernd: rebased for version 8.0.4]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -29,24 +31,23 @@ diff --git a/configure.ac b/configure.ac
 index 232ee9bed..6277cb9b6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1219,6 +1219,8 @@
+@ -1263,6 +1263,8 @@
          fi
      fi
  
-+    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:])
++    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}" with_pkgconfig_pcap=yes],[with_pkgconfig_pcap=no])
 +
      if test "$have_wpcap" != "yes"; then
          AC_CHECK_LIB(pcap, pcap_open_dead, [], [
              echo
-@@ -1234,8 +1236,6 @@
+@@ -1278,7 +1280,6 @@
          PCAP_LIB_NAME="pcap"
      fi
  
--    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:])
--
-     AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
-     if test "$HAVE_PCAP_CONFIG" = "no" -o "$cross_compiling" = "yes"; then
-         AC_MSG_RESULT(no pcap-config is use)
+-    PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}" with_pkgconfig_pcap=yes],[with_pkgconfig_pcap=no])
+     if test "$with_pkgconfig_pcap" != "yes"; then
+         AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
+         if test "$HAVE_PCAP_CONFIG" = "no" -o "x$cross_compiling" = "xyes"; then
 -- 
 2.43.0
 
diff --git a/package/suricata/Config.in b/package/suricata/Config.in
index 5f7eb21da0..64069888d8 100644
--- a/package/suricata/Config.in
+++ b/package/suricata/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_SURICATA
 	select BR2_PACKAGE_LIBHTP
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBYAML
-	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE2
 	help
 	  Suricata is a free and open source, mature, fast and robust
 	  network threat detection engine.
@@ -18,7 +18,7 @@ config BR2_PACKAGE_SURICATA
 	  detection (IDS), inline intrusion prevention (IPS), network
 	  security monitoring (NSM) and offline pcap processing.
 
-	  https://suricata-ids.org
+	  https://suricata.io
 
 comment "suricata needs a toolchain w/ wchar, threads"
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash
index ea5ba01dc0..15f7e666b3 100644
--- a/package/suricata/suricata.hash
+++ b/package/suricata/suricata.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  c1515754924b618914fcb3cb98873af49996b920f2389a1998f89604f227a807  suricata-6.0.20.tar.gz
+sha256  81cee7bae69848a9751b2ce0867620eefa52b192e79c20b5eac897600b28b191  suricata-8.0.4.tar.gz
 
 # Hash for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk
index 8840853054..0ee3752a21 100644
--- a/package/suricata/suricata.mk
+++ b/package/suricata/suricata.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SURICATA_VERSION = 6.0.20
+SURICATA_VERSION = 8.0.4
 SURICATA_SITE = https://www.openinfosecfoundation.org/download
 SURICATA_LICENSE = GPL-2.0
 SURICATA_LICENSE_FILES = COPYING LICENSE
@@ -24,7 +24,7 @@ SURICATA_DEPENDENCIES = \
 	libpcap \
 	libyaml \
 	$(if $(BR2_PACKAGE_LZ4),lz4) \
-	pcre \
+	pcre2 \
 	$(if $(BR2_PACKAGE_XZ),xz)
 
 SURICATA_CONF_ENV = \
@@ -32,6 +32,9 @@ SURICATA_CONF_ENV = \
 	CARGO_HOME=$(BR_CARGO_HOME) \
 	RUST_TARGET=$(RUSTC_TARGET_NAME)
 
+SURICATA_MAKE_ENV = \
+	CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(TARGET_CROSS)gcc
+
 SURICATA_CONF_OPTS = \
 	--disable-gccprotect \
 	--disable-pie \