diff --git a/converters/base64/Makefile b/converters/base64/Makefile
index c7ac5f1a447..c5ba03f12cf 100644
--- a/converters/base64/Makefile
+++ b/converters/base64/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.fourmilab.ch/webtools/base64/
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c
 
-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}
 
 CONFIGURE_STYLE=gnu
 ALL_TARGET=	prog
diff --git a/converters/bdf2psf/Makefile b/converters/bdf2psf/Makefile
index 6aa5338e911..95d5c0654aa 100644
--- a/converters/bdf2psf/Makefile
+++ b/converters/bdf2psf/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE =	https://packages.debian.org/sid/bdf2psf
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =	${MASTER_SITE_DEBIAN:=main/c/console-setup/}
+SITES =		${SITE_DEBIAN:=main/c/console-setup/}
 
 WRKDIST =	${WRKDIR}/console-setup
 
diff --git a/converters/bdf2sfd/Makefile b/converters/bdf2sfd/Makefile
index 3a492797598..f2f6f17a6fb 100644
--- a/converters/bdf2sfd/Makefile
+++ b/converters/bdf2sfd/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 # uses pledge()
 WANTLIB +=	c
 
-MASTER_SITES =	https://github.com/fcambus/bdf2sfd/releases/download/$V/
+SITES =		https://github.com/fcambus/bdf2sfd/releases/download/$V/
 
 MODULES =	devel/cmake
 
diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 18a3fc87ed7..dd3dcb598d7 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -8,7 +8,7 @@ REVISION =	0
 PERMIT_PACKAGE=	Yes
 WANTLIB=		c
 
-MASTER_SITES=	http://www.netsw.org/system/tools/fileutils/encode/
+SITES=		http://www.netsw.org/system/tools/fileutils/encode/
 PATCHFILES=	btoa-5.2-patch1.gz
 
 MAKE_FLAGS=	DESTDIR=${PREFIX}
diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index 6152be1a8c5..b62bcbe3068 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -6,7 +6,7 @@ HOMEPAGE =		https://www.j3e.de/linux/convmv/
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-MASTER_SITES =		${HOMEPAGE}
+SITES =			${HOMEPAGE}
 
 PKG_ARCH =		*
 
diff --git a/converters/d1489/Makefile b/converters/d1489/Makefile
index ebc7635c22e..db39dc629e8 100644
--- a/converters/d1489/Makefile
+++ b/converters/d1489/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	d1489-1.5.1
 REVISION=	0
 CATEGORIES=	converters
 
-MASTER_SITES=	http://koi8.pp.ru/dist/
+SITES=		http://koi8.pp.ru/dist/
 EXTRACT_SUFX=	.tgz
 
 # MIT
diff --git a/converters/dos2unix/Makefile b/converters/dos2unix/Makefile
index 2b5d71d24ca..80031e51eaa 100644
--- a/converters/dos2unix/Makefile
+++ b/converters/dos2unix/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c intl
 
-MASTER_SITES=	https://waterlan.home.xs4all.nl/dos2unix/
+SITES=		https://waterlan.home.xs4all.nl/dos2unix/
 
 BUILD_DEPENDS=	devel/gettext,-tools
 
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index 1e86908182a..14c52770e06 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB =  c iconv intl m recode
 
-MASTER_SITES=		http://dl.cihar.com/enca/
+SITES=			http://dl.cihar.com/enca/
 
 
 BUILD_DEPENDS=		converters/p5-Unicode-Map8
diff --git a/converters/fondu/Makefile b/converters/fondu/Makefile
index 93961d2d4bf..e51cece6984 100644
--- a/converters/fondu/Makefile
+++ b/converters/fondu/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB += c m
 
-MASTER_SITES =	http://fondu.sourceforge.net/
+SITES =		http://fondu.sourceforge.net/
 
 WRKDIST =	${WRKDIR}/${PKGNAME}
 
diff --git a/converters/html2text/Makefile b/converters/html2text/Makefile
index 41fa393e85b..cec8328ca49 100644
--- a/converters/html2text/Makefile
+++ b/converters/html2text/Makefile
@@ -14,7 +14,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
-MASTER_SITES=		http://www.mbayer.de/html2text/downloads/ \
+SITES=			http://www.mbayer.de/html2text/downloads/ \
 			ftp://ftp.ibiblio.org/pub/linux/apps/www/converters/
 
 COMPILER =		base-clang ports-gcc base-gcc
diff --git a/converters/html2wml/Makefile b/converters/html2wml/Makefile
index 7307caf08b9..0d994bfaf12 100644
--- a/converters/html2wml/Makefile
+++ b/converters/html2wml/Makefile
@@ -9,8 +9,8 @@ HOMEPAGE =	http://maddingue.free.fr/softwares/html2wml.html.en
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES =	http://maddingue.free.fr/softwares/download/Html2Wml/ \
-		${MASTER_SITE_SOURCEFORGE:=htmlwml/}
+SITES =		http://maddingue.free.fr/softwares/download/Html2Wml/ \
+		${SITE_SOURCEFORGE:=htmlwml/}
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	www/p5-libwww \
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index 9e1ed91b141..0cdf7cf299c 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -10,9 +10,8 @@ PERMIT_DISTFILES=	no license
 
 WANTLIB += c
 
-MASTER_SITES=	\
-	${MASTER_SITE_FREEBSD} \
-	http://www.unix.gr.jp/jnetcex/soft/
+SITES=		${SITE_FREEBSD} \
+		http://www.unix.gr.jp/jnetcex/soft/
 
 MAKE_FILE=	makefile
 MAKE_FLAGS=	CFLAGS="${CFLAGS}" CC="${CC}"
diff --git a/converters/k2pdfopt/Makefile b/converters/k2pdfopt/Makefile
index f71f0c3b99e..be06fec75a5 100644
--- a/converters/k2pdfopt/Makefile
+++ b/converters/k2pdfopt/Makefile
@@ -25,7 +25,7 @@ COMMENT =	optimizes PDF/DJVU files for mobile e-readers
 V =		2.42
 DISTNAME =	k2pdfopt_v${V}_src
 PKGNAME =	k2pdfopt-${V}
-MASTER_SITES =	http://willus.com/k2pdfopt/src/
+SITES =		http://willus.com/k2pdfopt/src/
 EXTRACT_SUFX =	.zip
 REVISION =	3
 
diff --git a/converters/libdvdcss/Makefile b/converters/libdvdcss/Makefile
index 3184c2ddac3..0589334cb95 100644
--- a/converters/libdvdcss/Makefile
+++ b/converters/libdvdcss/Makefile
@@ -3,7 +3,7 @@ COMMENT=	descramble scrambled DVDs
 VER=		1.4.3
 DISTNAME=	libdvdcss-${VER}
 CATEGORIES=	converters
-MASTER_SITES=	https://download.videolan.org/pub/videolan/libdvdcss/${VER}/
+SITES=		https://download.videolan.org/pub/videolan/libdvdcss/${VER}/
 EXTRACT_SUFX=	.tar.bz2
 
 SHARED_LIBS=	dvdcss	4.1
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 73d13f15e1e..a03c2bd2291 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -2,7 +2,7 @@ COMMENT=	character set conversion library
 
 DISTNAME=	libiconv-1.17
 CATEGORIES=	converters devel
-MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
+SITES=		${SITE_GNU:=libiconv/}
 
 SHARED_LIBS=	charset		1.1 \
 		iconv		7.1
diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile
index f1f5a2635d0..91473e948dd 100644
--- a/converters/libpst/Makefile
+++ b/converters/libpst/Makefile
@@ -32,7 +32,7 @@ WANTLIB-python += pst boost_python${MODPY_VERSION:C/\.//g}-mt
 
 COMPILER =		base-clang ports-gcc base-gcc
 
-MASTER_SITES=		http://www.five-ten-sg.com/libpst/packages/
+SITES=			http://www.five-ten-sg.com/libpst/packages/
 
 MULTI_PACKAGES=		-main -python
 
diff --git a/converters/libunistring/Makefile b/converters/libunistring/Makefile
index cc39bac6788..d0676a876a1 100644
--- a/converters/libunistring/Makefile
+++ b/converters/libunistring/Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =		iconv
 
-MASTER_SITES =		${MASTER_SITE_GNU:=libunistring/}
+SITES =			${SITE_GNU:=libunistring/}
 
 LIB_DEPENDS =		converters/libiconv
 
diff --git a/converters/luastruct/Makefile b/converters/luastruct/Makefile
index 9b505878938..c09a0870abc 100644
--- a/converters/luastruct/Makefile
+++ b/converters/luastruct/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.inf.puc-rio.br/~roberto/struct/
 # MIT
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}
 
 MODULES=	lang/lua
 
diff --git a/converters/mimepp/Makefile b/converters/mimepp/Makefile
index 76e79e38b38..e0d6bbd2525 100644
--- a/converters/mimepp/Makefile
+++ b/converters/mimepp/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=		converters
 PERMIT_PACKAGE=		restrictive non-commercial license
 PERMIT_DISTFILES=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/c++/}
+SITES=			${SITE_SUNSITE:=devel/lang/c++/}
 
 MAKE_FILE=		makefile.unx
 MAKE_FLAGS=		CXX="${CXX}"
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index d671dfd3e9e..a3bbbf5df5e 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -9,7 +9,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB += c
 
-MASTER_SITES=	http://ftp.andrew.cmu.edu/pub/mpack/ \
+SITES=		http://ftp.andrew.cmu.edu/pub/mpack/ \
 		https://spacehopper.org/mirrors/
 
 CONFIGURE_STYLE= gnu
diff --git a/converters/otf2bdf/Makefile b/converters/otf2bdf/Makefile
index aaf78d333c1..91f2a40d692 100644
--- a/converters/otf2bdf/Makefile
+++ b/converters/otf2bdf/Makefile
@@ -3,7 +3,7 @@ CATEGORIES =	converters fonts
 HOMEPAGE = 	http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/
 DISTNAME = 	otf2bdf-3.1
 REVISION =	2
-MASTER_SITES =	http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/
+SITES =		http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/
 EXTRACT_SUFX =	.tgz
 
 # BSD
diff --git a/converters/pflogx/Makefile b/converters/pflogx/Makefile
index 94a16e6607e..920a5ddc799 100644
--- a/converters/pflogx/Makefile
+++ b/converters/pflogx/Makefile
@@ -14,7 +14,7 @@ WANTLIB= 		c expat m pcap ${COMPILER_LIBCXX}
 
 COMPILER =		base-clang ports-gcc base-gcc
 
-MASTER_SITES=		${HOMEPAGE}/releases/ \
+SITES=			${HOMEPAGE}/releases/ \
 			https://distfiles.sigtrap.nl/
 
 MAKE_FLAGS=		WITH_EXPAT=1 \
diff --git a/converters/ppmtoTbmp/Makefile b/converters/ppmtoTbmp/Makefile
index f86e5c4c369..f6acfc8daa3 100644
--- a/converters/ppmtoTbmp/Makefile
+++ b/converters/ppmtoTbmp/Makefile
@@ -7,9 +7,9 @@ HOMEPAGE=	http://www.isaac.cs.berkeley.edu/pilot/
 
 PERMIT_PACKAGE=	Yes
 
-WANTLIB=		c m netpbm
+WANTLIB=	c m netpbm
 
-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}
 
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/netpbm" \
 		LDLIBS="-L${LOCALBASE}/lib -lnetpbm -lm"
diff --git a/converters/qprint/Makefile b/converters/qprint/Makefile
index 81b833c0c58..18f2e7a1f3f 100644
--- a/converters/qprint/Makefile
+++ b/converters/qprint/Makefile
@@ -7,9 +7,9 @@ REVISION =	0
 
 # public domain
 PERMIT_PACKAGE=	Yes
-WANTLIB=		c
+WANTLIB=	c
 
-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}
 
 AUTOCONF_VERSION=	2.13
 CONFIGURE_STYLE=	autoconf no-autoheader
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index ab135fa4c26..d473aa39503 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c iconv intl
 
-MASTER_SITES=	https://github.com/rrthomas/recode/releases/download/v$V/
+SITES=		https://github.com/rrthomas/recode/releases/download/v$V/
 
 MODULES=	lang/python
 MODPY_RUNDEP=	No
diff --git a/converters/ripmime/Makefile b/converters/ripmime/Makefile
index ae45b85db0b..1ebfa5466b5 100644
--- a/converters/ripmime/Makefile
+++ b/converters/ripmime/Makefile
@@ -12,7 +12,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c iconv
 
-MASTER_SITES=	${HOMEPAGE}
+SITES=		${HOMEPAGE}
 
 LIB_DEPENDS=	converters/libiconv
 
diff --git a/converters/sqlite2mdoc/Makefile b/converters/sqlite2mdoc/Makefile
index 91c03cdfc27..a0bd891cb74 100644
--- a/converters/sqlite2mdoc/Makefile
+++ b/converters/sqlite2mdoc/Makefile
@@ -6,7 +6,7 @@ MAINTAINER =		Kristaps Dzonsons <kristaps@bsd.lv>
 
 CATEGORIES =		converters databases
 HOMEPAGE =		https://github.com/kristapsdz/sqlite2mdoc
-MASTER_SITES =		https://kristaps.bsd.lv/sqlite2mdoc/snapshots/
+SITES =			https://kristaps.bsd.lv/sqlite2mdoc/snapshots/
 
 # ISC
 PERMIT_PACKAGE =	Yes
diff --git a/converters/trans/Makefile b/converters/trans/Makefile
index 8eea589a1e3..9b68d897056 100644
--- a/converters/trans/Makefile
+++ b/converters/trans/Makefile
@@ -9,7 +9,7 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB=		c
 
-MASTER_SITES=	http://www.kostis.net/freeware/
+SITES=		http://www.kostis.net/freeware/
 
 LIBDIR= ${PREFIX}/lib/trans
 ALL= transhtm transiso transce8 transtab checkiso checkuni
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 042b9c0c643..adc8e9e85ed 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =	Yes
 
 WANTLIB =	c m
 
-MASTER_SITES =	${HOMEPAGE}download/
+SITES =		${HOMEPAGE}download/
 
 CONFIGURE_STYLE =	autoconf dest
 AUTOCONF_VERSION =	2.13
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 06d812cbc01..5b9f2e7beae 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -16,7 +16,7 @@ WANTLIB =  X11 bz2 c expat ffi freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gsf-1 iconv intl jpeg lzma m pcre2-8 png pthread
 WANTLIB += wmf-0.2 wmflite-0.2 xcb xml2 z
 
-MASTER_SITES =	http://abisource.com/downloads/wv/1.2.9/
+SITES =		http://abisource.com/downloads/wv/1.2.9/
 
 RUN_DEPENDS =	graphics/ImageMagick
 LIB_DEPENDS =	devel/libgsf \
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index 35b39379e0c..6d50afd82a4 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -4,7 +4,7 @@ REVISION =	4
 DISTNAME=	wv2-0.4.2
 SHARED_LIBS +=	wv2                  4.0      # .1.8
 CATEGORIES=	converters
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
+SITES=		${SITE_SOURCEFORGE:=wvware/}
 EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://wvware.sourceforge.net/
diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile
index 18555ff0b54..a5e2b1aeb54 100644
--- a/converters/xlhtml/Makefile
+++ b/converters/xlhtml/Makefile
@@ -7,7 +7,7 @@ REVISION=	4
 SHARED_LIBS +=	cole                 2.1      # .2.1
 CATEGORIES=	converters
 
-MASTER_SITES=	http://gd.tuwien.ac.at/utils/format-conv/xlHtml/
+SITES=		http://gd.tuwien.ac.at/utils/format-conv/xlHtml/
 HOMEPAGE=	http://chicago.sourceforge.net/xlhtml/
 
 PERMIT_PACKAGE=	Yes
diff --git a/converters/xmltoman/Makefile b/converters/xmltoman/Makefile
index e5f1a77500f..64a7950a77a 100644
--- a/converters/xmltoman/Makefile
+++ b/converters/xmltoman/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=		Benoit Lecocq <benoit@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmltoman/}
+SITES=			${SITE_SOURCEFORGE:=xmltoman/}
 
 NO_TEST=		Yes