diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile
index 2e44c23a27f0..62904f01571b 100644
--- a/sysutils/mcron/Makefile
+++ b/sysutils/mcron/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mcron
-PORTVERSION=	1.0.8
-PORTREVISION=	3
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
@@ -12,14 +11,13 @@ COMMENT=	100% compatible replacement for Vixie cron
 
 LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 
-USES=		pkgconfig
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
-MAKEFILE=	makefile
+TEST_TARGET=	check
 
 INFO=		mcron
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
-		${WRKSRC}/configure
+PLIST_SUB=	GUILE_SITE=share/guile/site/2.2 \
+		GUILE_SITE_CCACHE=lib/guile/2.2/site-ccache
 
 .include <bsd.port.mk>
diff --git a/sysutils/mcron/distinfo b/sysutils/mcron/distinfo
index 35a6a47a6bd0..c2216b712e09 100644
--- a/sysutils/mcron/distinfo
+++ b/sysutils/mcron/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mcron-1.0.8.tar.gz) = 2b5cf57ec620067d996e444114fe37b8d1a5e00b67c6517aa04f06e01ecfea7e
-SIZE (mcron-1.0.8.tar.gz) = 283775
+TIMESTAMP = 1597347729
+SHA256 (mcron-1.2.0.tar.gz) = 2d934da84db7dcb988778f55f43a74f699d5825c4900d13ef178965682cd2dd6
+SIZE (mcron-1.2.0.tar.gz) = 327587
diff --git a/sysutils/mcron/files/patch-makefile.in b/sysutils/mcron/files/patch-makefile.in
deleted file mode 100644
index b4b260c6d349..000000000000
--- a/sysutils/mcron/files/patch-makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- makefile.in.orig	2014-05-25 14:09:53 UTC
-+++ makefile.in
-@@ -1213,15 +1213,15 @@ mcron.c : scm/mcron/main.scm scm/mcron/c
- 	@rm -f mcron.escaped.scm > /dev/null 2>&1
- 
- install-exec-hook:
--	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes"   -a   "`id -u`" -eq "0" ]; then \
-+	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \
-        rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
--       $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
-+       $(INSTALL) -m='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
-        rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
--       $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
--       $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
--       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
--       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
--       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
-+       $(INSTALL) -m='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
-+       $(INSTALL) -d -m='u=rwx' $(DESTDIR)/var/cron; \
-+       $(INSTALL) -d -m='u=rwx,og=rx' $(DESTDIR)/var/run; \
-+       $(INSTALL) -d -m='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
-+       $(INSTALL) -d -m='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
-     elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
-        echo "Not installing Vixie-style programs"; \
-     else \
diff --git a/sysutils/mcron/pkg-plist b/sysutils/mcron/pkg-plist
index c70d72cd9aac..66078570b918 100644
--- a/sysutils/mcron/pkg-plist
+++ b/sysutils/mcron/pkg-plist
@@ -1,11 +1,30 @@
-bin/cron
 bin/crontab
 bin/mcron
+man/man1/crontab.1.gz
 man/man1/mcron.1.gz
-%%DATADIR%%/config.scm
-%%DATADIR%%/core.scm
-%%DATADIR%%/environment.scm
-%%DATADIR%%/job-specifier.scm
-%%DATADIR%%/redirect.scm
-%%DATADIR%%/vixie-specification.scm
-%%DATADIR%%/vixie-time.scm
+man/man8/cron.8.gz
+sbin/cron
+%%GUILE_SITE%%/mcron/base.scm
+%%GUILE_SITE%%/mcron/config.scm
+%%GUILE_SITE%%/mcron/core.scm
+%%GUILE_SITE%%/mcron/environment.scm
+%%GUILE_SITE%%/mcron/job-specifier.scm
+%%GUILE_SITE%%/mcron/redirect.scm
+%%GUILE_SITE%%/mcron/scripts/cron.scm
+%%GUILE_SITE%%/mcron/scripts/crontab.scm
+%%GUILE_SITE%%/mcron/scripts/mcron.scm
+%%GUILE_SITE%%/mcron/utils.scm
+%%GUILE_SITE%%/mcron/vixie-specification.scm
+%%GUILE_SITE%%/mcron/vixie-time.scm
+%%GUILE_SITE_CCACHE%%/mcron/base.go
+%%GUILE_SITE_CCACHE%%/mcron/config.go
+%%GUILE_SITE_CCACHE%%/mcron/core.go
+%%GUILE_SITE_CCACHE%%/mcron/environment.go
+%%GUILE_SITE_CCACHE%%/mcron/job-specifier.go
+%%GUILE_SITE_CCACHE%%/mcron/redirect.go
+%%GUILE_SITE_CCACHE%%/mcron/scripts/cron.go
+%%GUILE_SITE_CCACHE%%/mcron/scripts/crontab.go
+%%GUILE_SITE_CCACHE%%/mcron/scripts/mcron.go
+%%GUILE_SITE_CCACHE%%/mcron/utils.go
+%%GUILE_SITE_CCACHE%%/mcron/vixie-specification.go
+%%GUILE_SITE_CCACHE%%/mcron/vixie-time.go