diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile
index 90d73b551611..b372b5443f09 100644
--- a/mail/imaptools/Makefile
+++ b/mail/imaptools/Makefile
@@ -1,24 +1,30 @@
 PORTNAME=	imaptools
 PORTVERSION=	1.135
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	LOCAL/bsam
-DISTNAME=	imap_tools_V${PORTVERSION}
+MASTER_SITES=	https://codeberg.org/portmaster/imap_tools/archive/${PORTVERSION}${EXTRACT_SUFX}?dummy=/
+DISTNAME=	${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tools and scripts to use with IMAP servers
-WWW=		http://www.athensfbc.com/imap_tools/
+WWW=		https://codeberg.org/portmaster/imap_tools/
 
 LICENSE=	ISCL
 
+USES=		shebangfix perl5
+USE_PERL5=	run
+
+SHEBANG_FILES=	*.pl
+
 CONFLICTS=	imaputils
 
-NO_WRKSUBDIR=	yes
+#NO_WRKSUBDIR=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		shebangfix perl5
-SHEBANG_FILES=	*.pl
-USE_PERL5=	run
+
+WRKSRC=		${WRKDIR}/imap_tools
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/mail/imaptools/distinfo b/mail/imaptools/distinfo
index f5448a7336e5..6db113965e33 100644
--- a/mail/imaptools/distinfo
+++ b/mail/imaptools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (imap_tools_V1.135.tar.gz) = c55388f90b5af852b478420c05445a14b283abcb45c97d89e9681cd3f2196152
-SIZE (imap_tools_V1.135.tar.gz) = 108952
+TIMESTAMP = 1672511555
+SHA256 (1.135.tar.gz) = 66ab903f6c17f59871667dfed78dc722911bfc1b9ffe14d071c943bbc831d1ee
+SIZE (1.135.tar.gz) = 110953
diff --git a/mail/imaptools/pkg-descr b/mail/imaptools/pkg-descr
index 579f20498937..cabe4c1b6b48 100644
--- a/mail/imaptools/pkg-descr
+++ b/mail/imaptools/pkg-descr
@@ -1 +1 @@
-A number of tools and scripts for use with IMAP servers.
+A number of tools and scripts to manage IMAP services.