diff --git a/mail/postfix-logwatch/Makefile b/mail/postfix-logwatch/Makefile
index 3ff0a11e87be..4502769e4d15 100644
--- a/mail/postfix-logwatch/Makefile
+++ b/mail/postfix-logwatch/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	postfix-logwatch
-PORTVERSION=	1.40.03
-PORTREVISION=	2
+PORTVERSION=	1.40.07
 CATEGORIES=	mail
-MASTER_SITES=	SF/logreporters/${PORTNAME}/release/${PORTVERSION}
+MASTER_SITES=	https://michael.orlitzky.com/code/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Postfix MTA log parser
-WWW=		https://logreporters.sourceforge.net/
+WWW=		https://michael.orlitzky.com/code/postfix-logwatch.xhtml
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PORTDOCS=	Bugs Changes README
-PORTEXAMPLES=	${PORTNAME}.conf ${PORTNAME}.conf-topn
-
-USES=		perl5 shebangfix tar:tgz
+USES=		perl5 shebangfix tar:xz
 USE_PERL5=	run
-NO_BUILD=	yes
 SHEBANG_FILES=	${PORTNAME}
 
+NO_BUILD=	yes
+
+PORTDOCS=	Bugs Changes README.rst
+PORTEXAMPLES=	${PORTNAME}.conf ${PORTNAME}.conf-topn
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@(cd ${WRKSRC} && \
 		${REINPLACE_CMD} -e 's!/usr/local/etc!${ETCDIR}!' \
-		${PORTNAME} ${PORTNAME}.1 README)
+		${PORTNAME} ${PORTNAME}.1 README.rst)
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-logwatch/distinfo b/mail/postfix-logwatch/distinfo
index a8fcfcd122d0..8b1fa30190f2 100644
--- a/mail/postfix-logwatch/distinfo
+++ b/mail/postfix-logwatch/distinfo
@@ -1,2 +1,3 @@
-SHA256 (postfix-logwatch-1.40.03.tgz) = c9aae87471554bb93c9d91bd2df3999ce3fae19f75ffd43fdee3f8552232c748
-SIZE (postfix-logwatch-1.40.03.tgz) = 107065
+TIMESTAMP = 1789266005
+SHA256 (postfix-logwatch-1.40.07.tar.xz) = 923a664af034e4ad74ae086fa8e272476b855b6521107c3b4be9f278d2e121f5
+SIZE (postfix-logwatch-1.40.07.tar.xz) = 79396
diff --git a/mail/postfix-logwatch/files/patch-postfix-logwatch b/mail/postfix-logwatch/files/patch-postfix-logwatch
deleted file mode 100644
index 3d07be9ec19b..000000000000
--- a/mail/postfix-logwatch/files/patch-postfix-logwatch
+++ /dev/null
@@ -1,22 +0,0 @@
---- postfix-logwatch.orig	2018-05-01 12:00:39 UTC
-+++ postfix-logwatch
-@@ -1377,6 +1377,10 @@ sub print_summary_report (\@) {
-                   sprintf "$fmt  %-42s %6.2f%%\n", $total, $desc,
-                      $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
-             }
-+            elsif ($extra eq '') {
-+               push @{$lines[$cur_level]}, 
-+                  sprintf "$fmt  %-23s\n", $total, $desc;
-+            }
-             else {
-                push @{$lines[$cur_level]}, 
-                   sprintf "$fmt  %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
-@@ -1847,7 +1851,7 @@ sub postfix_policy_spf($) {
-         # KeyboardInterrupt 
-         $line =~ /^Read line: "/ or
-         $line =~ /^Found the end of entry$/ or
--        $line =~ /^Config: {/ or
-+        $line =~ /^Config: \{/ or
-         $line =~ /^spfcheck: pyspf result/ or
-         $line =~ /^Starting$/ or
-         $line =~ /^Normal exit$/ or