diff --git a/ports-mgmt/portfmt/Makefile b/ports-mgmt/portfmt/Makefile
index 977b9ce541ab..9edaba7849ab 100644
--- a/ports-mgmt/portfmt/Makefile
+++ b/ports-mgmt/portfmt/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	portfmt
 DISTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	https://github.com/t6/portfmt/releases/download/v${DISTVERSION}/
+MASTER_SITES=	https://codeberg.org/attachments/0991a836-2810-45b3-9035-45716b5a29a7?dummy=/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Format FreeBSD Ports Makefiles
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 ninja tar:lz
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	AR="${AR}" \
 		CC="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		DESTDIR="${STAGEDIR}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		LDFLAGS="${LDFLAGS}" \
 		PREFIX="${PREFIX}"
 
 OPTIONS_DEFINE=	SUBPACKAGES
 
 SUBPACKAGES_DESC=	Subpackages support (D16457)
 
 SUBPACKAGES_CONFIGURE_OFF=	FEATURES="!subpackages"
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portfmt/files/patch-6ae6bd4e645070b91ece4f6d393cdfbb836b86ef b/ports-mgmt/portfmt/files/patch-6ae6bd4e645070b91ece4f6d393cdfbb836b86ef
new file mode 100644
index 000000000000..0ddd1348c431
--- /dev/null
+++ b/ports-mgmt/portfmt/files/patch-6ae6bd4e645070b91ece4f6d393cdfbb836b86ef
@@ -0,0 +1,18 @@
+From 6ae6bd4e645070b91ece4f6d393cdfbb836b86ef Mon Sep 17 00:00:00 2001
+From: Tobias Kortkamp <tobik@FreeBSD.org>
+Date: Fri, 19 Aug 2022 15:48:12 +0200
+Subject: [PATCH] Replace references to GitHub
+
+diff --git parser/edits/lint/order.c parser/edits/lint/order.c
+index df69f2d..57f610c 100644
+--- parser/edits/lint/order.c
++++ parser/edits/lint/order.c
+@@ -377,7 +377,7 @@ check_variable_order(struct Parser *parser, struct AST *root, bool no_color)
+ 		row(pool, target, "# Portclippy to ignore them.", NULL);
+ 		row(pool, target, "#", NULL);
+ 		row(pool, target, "# If in doubt please report this on portfmt's bug tracker:", NULL);
+-		row(pool, target, "# https://github.com/t6/portfmt/issues", NULL);
++		row(pool, target, "# https://codeberg.org/tobik/portfmt/issues", NULL);
+ 	}
+ 	ARRAY_FOREACH(unknowns, char *, var) {
+ 		struct Set *uses_candidates = NULL;
diff --git a/ports-mgmt/portfmt/pkg-descr b/ports-mgmt/portfmt/pkg-descr
index 5d525cd4172f..46442eee12cc 100644
--- a/ports-mgmt/portfmt/pkg-descr
+++ b/ports-mgmt/portfmt/pkg-descr
@@ -1,25 +1,25 @@
 Portfmt is a collection of tools for editing, formatting, and linting
 FreeBSD Ports Collection Makefiles.
 
 It comes with several tools:
 
 - portfmt formats Makefiles
 - portclippy is a linter that checks if variables are in the correct
   order in a more comprehensive way than portlint
 - portedit edits Makefiles.  It comes with several commands
   that can be used as a basis for your own port update scripts:
   - bump-epoch: bumps PORTEPOCH or inserts it at the right place
   - bump-revision: bumps PORTREVISION or inserts it at the right place
   - get: lookup unevaluated variable values
   - merge: Generic command to set/update variables while also
     formatting the updated variables properly and inserting them
     in the right places if necessary.  Useful for merging output
     of other tools like make cargo-crates, modules2tuple, or make
     stage-qa.  For example to mark a port deprecated:
 
 	printf "DEPRECATED=%s\nEXPIRATION_DATE=%s" \
 		Abandonware 2019-08-15 | portedit merge -i Makefile
 
   - set-version: resets PORTREVISION, sets DISTVERSION or PORTVERSION
 
-WWW: https://github.com/t6/portfmt
+WWW: https://codeberg.org/tobik/portfmt