diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 3e77825d016c..9042fc121a11 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594820395
-SHA256 (munin-2.0.64.tar.gz) = 1323c17acc728f9541cc0a526a66bcc213b3a23e18310d2c83c16054b071ed86
-SIZE (munin-2.0.64.tar.gz) = 2249517
+TIMESTAMP = 1604063804
+SHA256 (munin-2.0.65.tar.gz) = eec9b581eaee2227e6372973f3ea0cb9fab8e71dd9154217be80052b77a330b8
+SIZE (munin-2.0.65.tar.gz) = 2249878
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 136039a14f02..c21f0b7380f2 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,6 +1,6 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.64
+MUNIN_VERSION=	2.0.65
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 3fa12f9cf447..0caf0d178d2f 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -74,6 +74,9 @@ post-patch:
 		${WRKSRC}/node/sbin/munin-node \
 		${WRKSRC}/node/sbin/munin-node-configure \
 		${WRKSRC}/node/sbin/munin-run
+	@${RM}  ${WRKSRC}/node/sbin/munin-node.bak \
+		${WRKSRC}/node/sbin/munin-node-configure.bak \
+		${WRKSRC}/node/sbin/munin-run.bak
 	@${REINPLACE_CMD} \
 		-e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \
 		-e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \