diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 352ebd641329..1524586f39df 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	logrotate
-PORTVERSION=	3.13.0
-PORTREVISION=	3
+DISTVERSION=	3.22.0
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	js@iksz.hu
 COMMENT=	Daemon to rotate, compress, remove, and mail system log files
+WWW=		https://github.com/logrotate/logrotate/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpopt.so:devel/popt
 
-USE_GITHUB=	yes
-
-PATCH_STRIP=		-p1
-USES=		autoreconf cpe gmake localbase
+USES=		cpe gmake localbase tar:xz
 CPE_VENDOR=	logrotate_project
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-default-mail-command=/usr/bin/mailx \
 		--with-compress-command=/usr/bin/gzip \
 		--with-uncompress-command=/usr/bin/gunzip \
 		--with-state-file-path=/var/run/logrotate.status
+SUB_FILES=	logrotate.conf.sample
 
 post-install:
-	${SED} -e 's|__PREFIX__|${PREFIX}|' \
-		< ${FILESDIR}/logrotate.conf.sample > ${STAGEDIR}${PREFIX}/etc/logrotate.conf.sample
-	${MKDIR} ${STAGEDIR}${ETCDIR}.d
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/logrotate.conf.sample \
+		${STAGEDIR}${PREFIX}/etc/logrotate.conf.sample
+	${MKDIR} ${STAGEDIR}${ETCDIR}.d \
+		 ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/syslog.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index bc06a4318c52..b9987f711dc6 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508013010
-SHA256 (logrotate-logrotate-3.13.0_GH0.tar.gz) = fb1ff8502e7ae4aedaa3d0da8d3740a6a0f44b72e34666af724e9094b166c942
-SIZE (logrotate-logrotate-3.13.0_GH0.tar.gz) = 82436
+TIMESTAMP = 1770494949
+SHA256 (logrotate-3.22.0.tar.xz) = 42b4080ee99c9fb6a7d12d8e787637d057a635194e25971997eebbe8d5e57618
+SIZE (logrotate-3.22.0.tar.xz) = 172108
diff --git a/sysutils/logrotate/files/logrotate.conf.sample b/sysutils/logrotate/files/logrotate.conf.sample.in
similarity index 92%
rename from sysutils/logrotate/files/logrotate.conf.sample
rename to sysutils/logrotate/files/logrotate.conf.sample.in
index 0d6f5c2d18d8..64a326fe6bf6 100644
--- a/sysutils/logrotate/files/logrotate.conf.sample
+++ b/sysutils/logrotate/files/logrotate.conf.sample.in
@@ -1,23 +1,23 @@
 # see "man logrotate" for details
 # rotate log files weekly
 weekly
 
 # keep 4 weeks worth of backlogs
 rotate 4
 
 # create new (empty) log files after rotating old ones
 create
 
 # uncomment this if you want your log files compressed
 compress
 
 # RPM packages drop log rotation information into this directory
-include __PREFIX__/etc/logrotate.d
+include %%PREFIX%%/etc/logrotate.d
 
 /var/log/lastlog {
     monthly
     rotate 1
     missingok
 }
 
 # system-specific logs may be configured here
diff --git a/sysutils/logrotate/files/patch-config.c b/sysutils/logrotate/files/patch-config.c
deleted file mode 100644
index 03259d90c3c0..000000000000
--- a/sysutils/logrotate/files/patch-config.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- config.c.orig	2017-10-12 15:19:41 UTC
-+++ config.c
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -27,6 +27,8 @@
- 
- #include "log.h"
- #include "logrotate.h"
-+
-+extern struct logInfoHead logs;
- 
- #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
- #define GLOB_ABORTED GLOB_ABEND
diff --git a/sysutils/logrotate/files/patch-logrotate.c b/sysutils/logrotate/files/patch-logrotate.c
deleted file mode 100644
index 031d9fde7e38..000000000000
--- a/sysutils/logrotate/files/patch-logrotate.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- logrotate.c.orig	2017-10-12 15:19:41 UTC
-+++ logrotate.c
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -29,6 +29,8 @@
- 
- #include "log.h"
- #include "logrotate.h"
-+
-+struct logInfoHead logs;
- 
- static void *prev_context;
- #ifdef WITH_SELINUX
diff --git a/sysutils/logrotate/files/patch-logrotate.h b/sysutils/logrotate/files/patch-logrotate.h
deleted file mode 100644
index ec8437eba696..000000000000
--- a/sysutils/logrotate/files/patch-logrotate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- logrotate.h.orig	2017-10-12 15:19:41 UTC
-+++ logrotate.h
-@@ -80,7 +80,7 @@
-     TAILQ_ENTRY(logInfo) list;
- };
- 
--TAILQ_HEAD(logInfoHead, logInfo) logs;
-+TAILQ_HEAD(logInfoHead, logInfo);
- 
- extern int numLogs;
- extern int debug;