diff --git a/.gitignore b/.gitignore
index 864b4d7..f3092b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ suricata-1.0.0.tar.gz.sig
 /suricata-5.0.4.tar.gz
 /suricata-5.0.5.tar.gz
 /suricata-5.0.6.tar.gz
+/suricata-5.0.7.tar.gz
diff --git a/sources b/sources
index b301a25..48e212f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (suricata-5.0.6.tar.gz) = 73580721683f929a90b6b59673842c051fe44ee7b8d8d890106aad09952d5b8a8f3716f168c41b33feb5c32e0106f5926125313cc11b27bc5a9c65e90b21888f
+SHA512 (suricata-5.0.7.tar.gz) = dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
diff --git a/suricata-5.0.4-log-path-fixup.patch b/suricata-5.0.4-log-path-fixup.patch
deleted file mode 100644
index 6189ae0..0000000
--- a/suricata-5.0.4-log-path-fixup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp suricata-5.0.4.orig/configure.ac suricata-5.0.4/configure.ac
---- suricata-5.0.4.orig/configure.ac	2020-10-07 17:01:44.000000000 -0400
-+++ suricata-5.0.4/configure.ac	2020-10-15 12:13:27.762707018 -0400
-@@ -2556,7 +2556,7 @@ if test "$WINDOWS_PATH" = "yes"; then
-         e_rustdir="$e_abs_srcdir/rust"
-     fi
- else
--    EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
-+    EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata")
-     EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")
-     EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")
-     EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")
diff --git a/suricata-5.0.7-log-path-fixup.patch b/suricata-5.0.7-log-path-fixup.patch
new file mode 100644
index 0000000..712a3c4
--- /dev/null
+++ b/suricata-5.0.7-log-path-fixup.patch
@@ -0,0 +1,22 @@
+diff -urp suricata-5.0.7.orig/configure.ac suricata-5.0.7/configure.ac
+--- suricata-5.0.7.orig/configure.ac	2021-06-30 11:32:47.000000000 -0400
++++ suricata-5.0.7/configure.ac	2021-07-01 17:06:19.000050629 -0400
+@@ -2557,7 +2557,7 @@ if test "$WINDOWS_PATH" = "yes"; then
+         e_rustdir="$e_abs_srcdir/rust"
+     fi
+ else
+-    EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/")
++    EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata")
+     EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")
+     EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")
+     EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")
+diff -urp suricata-5.0.7.orig/etc/suricata.logrotate.in suricata-5.0.7/etc/suricata.logrotate.in
+--- suricata-5.0.7.orig/etc/suricata.logrotate.in	2021-06-30 11:32:47.000000000 -0400
++++ suricata-5.0.7/etc/suricata.logrotate.in	2021-07-01 17:06:41.122048255 -0400
+@@ -1,5 +1,5 @@
+ # Sample /etc/logrotate.d/suricata configuration file.
+-@e_logdir@*.log @e_logdir@*.json {
++@e_logdir@/*.log @e_logdir@/*.json {
+         daily
+         missingok
+         rotate 5
diff --git a/suricata.spec b/suricata.spec
index 346ca1b..c080658 100644
--- a/suricata.spec
+++ b/suricata.spec
@@ -1,6 +1,6 @@
 Summary: Intrusion Detection System
 Name: suricata
-Version: 5.0.6
+Version: 5.0.7
 Release: 1%{?dist}
 License: GPLv2
 URL: https://suricata-ids.org/
@@ -20,7 +20,7 @@ Patch3: suricata-4.1.4-socket.patch
 # The default path needs to be fixed up to where Fedora keeps it
 Patch4: suricata-5.0.4-geolite-path-fixup.patch
 # The log path has an extra '/' at the end
-Patch5: suricata-5.0.4-log-path-fixup.patch
+Patch5: suricata-5.0.7-log-path-fixup.patch
 
 BuildRequires: gcc gcc-c++
 BuildRequires: cargo rust >= 1.33
@@ -180,6 +180,10 @@ chown suricata %{_var}/log/%{name}/*
 %{_datadir}/%{name}/rules
 
 %changelog
+* Thu Jul 01 2021 Steve Grubb <sgrubb@redhat.com> 5.0.7-1
+- New security and bugfix release
+- Fix logrotation directories (#1966955)
+
 * Tue Mar 02 2021 Steve Grubb <sgrubb@redhat.com> 5.0.6-1
 - New security and bugfix release