diff --git a/devel/texlab/Makefile b/devel/texlab/Makefile
index 9bc1751cf051..85bba0ee5cc1 100644
--- a/devel/texlab/Makefile
+++ b/devel/texlab/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	texlab
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2.0
 CATEGORIES=	devel
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Language Server Protocol for LaTeX
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	latex-lsp
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	CHANGELOG.md README.md docs/*
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/vipack/Makefile b/devel/vipack/Makefile
index fec76ea783e7..1aa8514c156c 100644
--- a/devel/vipack/Makefile
+++ b/devel/vipack/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	vipack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
 CATEGORIES=	devel
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Vishap package manager
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to compile: voc is not yet available for powerpc64
 
 BUILD_DEPENDS=	voc:lang/voc
 RUN_DEPENDS=	git:devel/git
 
 USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vishaps
 GH_TUPLE=	norayr:Internet:4b33066:Internet/dps/Internet \
 		norayr:lists:1fc8f0f:lists/dps/lists \
 		norayr:opts:cc882ee:opts/dps/opts \
 		norayr:time:c17a1c7:time/dps/time
 
 MAKEFILE=	makefile_freebsd
 
 PLIST_FILES=	bin/vipack
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/wrangler/Makefile b/devel/wrangler/Makefile
index a3f7c75c1b83..563230d1f31a 100644
--- a/devel/wrangler/Makefile
+++ b/devel/wrangler/Makefile
@@ -1,367 +1,367 @@
 PORTNAME=	wrangler
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.19.12
 PORTREVISION=	1
 CATEGORIES=	devel
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Cloudflare Workers CLI Tool
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 BROKEN_i386=	fails to build: error occurred: Command "cc" ... with args "cc" did not execute successfully (status code exit status: 1)
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		cargo gmake ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 
 CARGO_CRATES=	addr2line-0.17.0 \
 		adler-1.0.2 \
 		aho-corasick-0.7.18 \
 		ansi_term-0.12.1 \
 		anyhow-1.0.56 \
 		arrayref-0.3.6 \
 		arrayvec-0.5.2 \
 		assert_cmd-2.0.4 \
 		async-trait-0.1.53 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		backtrace-0.3.65 \
 		base64-0.13.0 \
 		billboard-0.1.0 \
 		binary-install-0.0.3-alpha.1 \
 		bitflags-1.3.2 \
 		blake2b_simd-0.5.11 \
 		block-buffer-0.7.3 \
 		block-buffer-0.9.0 \
 		block-padding-0.1.5 \
 		bstr-0.2.17 \
 		bumpalo-3.9.1 \
 		byte-tools-0.3.1 \
 		byteorder-1.4.3 \
 		bytes-0.4.12 \
 		bytes-1.1.0 \
 		bzip2-0.4.3 \
 		bzip2-sys-0.1.11+1.0.8 \
 		cc-1.0.73 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		chrome-devtools-rs-0.0.0-alpha.3 \
 		chrono-0.4.19 \
 		clap-2.34.0 \
 		clicolors-control-1.0.1 \
 		cloudflare-0.9.1 \
 		colored_json-2.1.0 \
 		combine-4.6.3 \
 		config-0.11.0 \
 		console-0.9.2 \
 		console-0.11.3 \
 		console-0.14.1 \
 		console-0.15.0 \
 		constant_time_eq-0.1.5 \
 		core-foundation-0.9.3 \
 		core-foundation-sys-0.8.3 \
 		cpufeatures-0.2.2 \
 		crc32fast-1.3.2 \
 		crossbeam-utils-0.8.8 \
 		csv-1.1.6 \
 		csv-core-0.1.10 \
 		curl-0.4.43 \
 		curl-sys-0.4.53+curl-7.82.0 \
 		darling-0.13.4 \
 		darling_core-0.13.4 \
 		darling_macro-0.13.4 \
 		data-encoding-2.3.2 \
 		difflib-0.4.0 \
 		digest-0.8.1 \
 		digest-0.9.0 \
 		dirs-1.0.5 \
 		dirs-2.0.2 \
 		dirs-3.0.2 \
 		dirs-sys-0.3.7 \
 		doc-comment-0.3.3 \
 		either-1.6.1 \
 		encode_unicode-0.3.6 \
 		encoding_rs-0.8.31 \
 		env_logger-0.8.4 \
 		erased-serde-0.3.20 \
 		error-chain-0.12.4 \
 		failure-0.1.8 \
 		failure_derive-0.1.8 \
 		fake-simd-0.1.2 \
 		fastrand-1.7.0 \
 		filetime-0.2.16 \
 		flate2-1.0.23 \
 		float-cmp-0.9.0 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		fs2-0.4.3 \
 		fs_extra-1.2.0 \
 		fsevent-0.4.0 \
 		fsevent-sys-2.0.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.3.21 \
 		futures-channel-0.3.21 \
 		futures-core-0.3.21 \
 		futures-executor-0.3.21 \
 		futures-io-0.3.21 \
 		futures-macro-0.3.21 \
 		futures-sink-0.3.21 \
 		futures-task-0.3.21 \
 		futures-util-0.3.21 \
 		generic-array-0.12.4 \
 		generic-array-0.14.5 \
 		getrandom-0.1.16 \
 		getrandom-0.2.6 \
 		gimli-0.26.1 \
 		globset-0.4.8 \
 		h2-0.3.13 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.4.3 \
 		http-0.2.6 \
 		http-body-0.4.4 \
 		httparse-1.7.0 \
 		httpdate-1.0.2 \
 		humantime-2.1.0 \
 		hyper-0.14.18 \
 		hyper-rustls-0.23.0 \
 		hyper-tls-0.5.0 \
 		ident_case-1.0.1 \
 		idna-0.2.3 \
 		ignore-0.4.18 \
 		indexmap-1.8.1 \
 		indicatif-0.15.0 \
 		inotify-0.7.1 \
 		inotify-sys-0.1.5 \
 		input_buffer-0.4.0 \
 		instant-0.1.12 \
 		iovec-0.1.4 \
 		ipnet-2.5.0 \
 		is_executable-0.1.2 \
 		itertools-0.10.3 \
 		itoa-0.4.8 \
 		itoa-1.0.1 \
 		js-sys-0.3.57 \
 		kernel32-sys-0.2.2 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
 		lexical-core-0.7.6 \
 		libc-0.2.124 \
 		libz-sys-1.1.5 \
 		line-wrap-0.1.1 \
 		linked-hash-map-0.5.4 \
 		log-0.4.16 \
 		matches-0.1.9 \
 		memchr-2.4.1 \
 		mime-0.3.16 \
 		mime_guess-2.0.4 \
 		miniz_oxide-0.5.1 \
 		mio-0.6.23 \
 		mio-0.8.2 \
 		mio-extras-2.0.6 \
 		miow-0.2.2 \
 		miow-0.3.7 \
 		native-tls-0.2.10 \
 		net2-0.2.37 \
 		nom-5.1.2 \
 		normalize-line-endings-0.3.0 \
 		notify-4.0.17 \
 		ntapi-0.3.7 \
 		num-integer-0.1.44 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.1 \
 		num_threads-0.1.5 \
 		number_prefix-0.3.0 \
 		number_prefix-0.4.0 \
 		oauth2-4.1.0 \
 		object-0.28.3 \
 		once_cell-1.10.0 \
 		opaque-debug-0.2.3 \
 		opaque-debug-0.3.0 \
 		openssl-0.10.38 \
 		openssl-probe-0.1.5 \
 		openssl-src-111.18.0+1.1.1n \
 		openssl-sys-0.9.72 \
 		os-version-0.2.0 \
 		parity-ws-0.11.1 \
 		path-slash-0.1.4 \
 		percent-encoding-1.0.1 \
 		percent-encoding-2.1.0 \
 		pin-project-1.0.10 \
 		pin-project-internal-1.0.10 \
 		pin-project-lite-0.2.8 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.25 \
 		plist-1.3.1 \
 		ppv-lite86-0.2.16 \
 		predicates-2.1.1 \
 		predicates-core-1.0.3 \
 		predicates-tree-1.0.5 \
 		prettytable-rs-0.8.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
 		proc-macro2-1.0.37 \
 		quote-1.0.18 \
 		rand-0.7.3 \
 		rand-0.8.5 \
 		rand_chacha-0.2.2 \
 		rand_chacha-0.3.1 \
 		rand_core-0.5.1 \
 		rand_core-0.6.3 \
 		rand_hc-0.2.0 \
 		redox_syscall-0.1.57 \
 		redox_syscall-0.2.13 \
 		redox_users-0.3.5 \
 		redox_users-0.4.3 \
 		regex-1.5.5 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
 		remove_dir_all-0.5.3 \
 		reqwest-0.11.10 \
 		ring-0.16.20 \
 		rust-argon2-0.8.3 \
 		rust-ini-0.13.0 \
 		rustc-demangle-0.1.21 \
 		rustls-0.20.4 \
 		rustls-native-certs-0.6.2 \
 		rustls-pemfile-0.2.1 \
 		rustls-pemfile-0.3.0 \
 		rustls-pemfile-1.0.0 \
 		rustversion-1.0.6 \
 		ryu-1.0.9 \
 		safemem-0.3.3 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
 		sct-0.7.0 \
 		security-framework-2.6.1 \
 		security-framework-sys-2.6.1 \
 		semver-1.0.7 \
 		serde-1.0.136 \
 		serde_derive-1.0.136 \
 		serde_json-1.0.79 \
 		serde_path_to_error-0.1.7 \
 		serde_qs-0.4.6 \
 		serde_urlencoded-0.7.1 \
 		serde_with-1.12.1 \
 		serde_with_macros-1.5.2 \
 		sha-1-0.8.2 \
 		sha-1-0.9.8 \
 		sha2-0.9.9 \
 		signal-hook-registry-1.4.0 \
 		siphasher-0.3.10 \
 		slab-0.4.6 \
 		socket2-0.4.4 \
 		spin-0.5.2 \
 		static_assertions-1.1.0 \
 		strsim-0.8.0 \
 		strsim-0.10.0 \
 		structopt-0.3.26 \
 		structopt-derive-0.4.18 \
 		syn-1.0.91 \
 		synstructure-0.12.6 \
 		sys-info-0.9.1 \
 		tar-0.4.38 \
 		tempfile-3.3.0 \
 		term-0.5.2 \
 		term_size-0.3.2 \
 		termcolor-1.1.3 \
 		terminal_size-0.1.17 \
 		termios-0.3.3 \
 		termtree-0.2.4 \
 		text_io-0.1.10 \
 		textwrap-0.11.0 \
 		thiserror-1.0.30 \
 		thiserror-impl-1.0.30 \
 		thread_local-1.1.4 \
 		time-0.1.44 \
 		time-0.3.9 \
 		tinyvec-1.5.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.17.0 \
 		tokio-macros-1.7.0 \
 		tokio-native-tls-0.3.0 \
 		tokio-retry-0.3.0 \
 		tokio-rustls-0.23.3 \
 		tokio-stream-0.1.8 \
 		tokio-tungstenite-0.14.0 \
 		tokio-util-0.7.1 \
 		toml-0.5.9 \
 		toml_edit-0.2.1 \
 		tower-service-0.3.1 \
 		tracing-0.1.34 \
 		tracing-attributes-0.1.20 \
 		tracing-core-0.1.26 \
 		try-lock-0.2.3 \
 		tungstenite-0.13.0 \
 		twox-hash-1.6.2 \
 		typenum-1.15.0 \
 		uname-0.1.1 \
 		unescape-0.1.0 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.7 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.9.0 \
 		unicode-width-0.1.9 \
 		unicode-xid-0.2.2 \
 		untrusted-0.7.1 \
 		url-2.2.2 \
 		utf-8-0.7.6 \
 		uuid-0.8.2 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
 		version_check-0.9.4 \
 		wait-timeout-0.2.0 \
 		walkdir-2.3.2 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.80 \
 		wasm-bindgen-backend-0.2.80 \
 		wasm-bindgen-futures-0.4.30 \
 		wasm-bindgen-macro-0.2.80 \
 		wasm-bindgen-macro-support-0.2.80 \
 		wasm-bindgen-shared-0.2.80 \
 		web-sys-0.3.57 \
 		webpki-0.22.0 \
 		webpki-roots-0.22.3 \
 		which-4.2.5 \
 		winapi-0.2.8 \
 		winapi-0.3.9 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		winreg-0.10.1 \
 		ws2_32-sys-0.2.1 \
 		xattr-0.2.2 \
 		xml-rs-0.8.4 \
 		yaml-rust-0.4.5 \
 		zip-0.5.13
 
 CARGO_FEATURES=	--no-default-features sys-openssl
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index d783bc12c219..b3611aa8df0b 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	mdk
 PORTVERSION=	1.3.0
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNU/${PORTNAME}/v${PORTVERSION}
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Utilities for developing programs using MIX and MIXAL
 
 LICENSE=	GPLv3
 
 USES=		gettext gmake gnome ncurses pkgconfig readline
 USE_GNOME=	glib20 gtk30 intltool
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 INFO=		mdk
 
 OPTIONS_DEFINE=	GUILE NLS
 OPTIONS_DEFAULT=GUILE
 OPTIONS_SUB=	yes
 
 GUILE_CONFIGURE_WITH=	guile
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 			libgc-threaded.so:devel/boehm-gc-threaded
 
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/dust/Makefile b/sysutils/dust/Makefile
index 0bbd157da9cb..c5f7c27576b7 100644
--- a/sysutils/dust/Makefile
+++ b/sysutils/dust/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	dust
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.1
 CATEGORIES=	sysutils
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	More intuitive version of du
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	bootandy
 
 PLIST_FILES=	bin/${PORTNAME}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/vultr-cli/Makefile b/www/vultr-cli/Makefile
index f239000dfe71..572a67371de7 100644
--- a/www/vultr-cli/Makefile
+++ b/www/vultr-cli/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	vultr-cli
 PORTVERSION=	2.14.2
 PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Official command line tool for Vultr services
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	vultr
 GH_TUPLE=	\
 		fsnotify:fsnotify:v1.5.4:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \
 		go-ini:ini:v1.66.4:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		go-yaml:yaml:v3.0.0:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
 		golang:net:2e3eb7b945c2:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:9780585627b5:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sys:bc2c85ada10a:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
 		google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
 		hashicorp:go-cleanhttp:v0.5.2:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-retryablehttp:v0.7.1:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		magiconair:properties:v1.8.6:magiconair_properties/vendor/github.com/magiconair/properties \
 		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		pelletier:go-toml:v1.9.5:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		pelletier:go-toml:v2.0.1:pelletier_go_toml_v2/vendor/github.com/pelletier/go-toml/v2 \
 		protocolbuffers:protobuf-go:v1.28.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		spf13:afero:v1.8.2:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cast:v1.5.0:spf13_cast/vendor/github.com/spf13/cast \
 		spf13:cobra:v1.4.0:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		spf13:viper:v1.12.0:spf13_viper/vendor/github.com/spf13/viper \
 		subosito:gotenv:v1.3.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
 		vultr:govultr:v2.17.2:vultr_govultr_v2/vendor/github.com/vultr/govultr/v2
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/sprop/Makefile b/x11/sprop/Makefile
index 291b823117a9..ce365a0a0917 100644
--- a/x11/sprop/Makefile
+++ b/x11/sprop/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	sprop
 PORTVERSION=	0.1
 CATEGORIES=	x11
 MASTER_SITES=	https://dl.suckless.org/tools/
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Simple X property utility
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		xorg
 USE_XORG=	x11
 
 MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
 		X11INC="${LOCALBASE}/include" CC="${CC}"
 PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/xssstate/Makefile b/x11/xssstate/Makefile
index bddef99c54d6..c75d243466fd 100644
--- a/x11/xssstate/Makefile
+++ b/x11/xssstate/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	xssstate
 PORTVERSION=	1.1
 CATEGORIES=	x11
 MASTER_SITES=	https://dl.suckless.org/tools/
 
-MAINTAINER=	kfv@kfv.io
+MAINTAINER=	antranigv@freebsd.am
 COMMENT=	Simple tool to retrieve the X screensaver state
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		localbase:ldflags xorg
 USE_XORG=	x11 xscrnsaver
 
 MAKE_ARGS=	LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" CC="${CC}"
 
 CFLAGS+=	-std=c99 -Wall -DVERSION=\\\"${PORTVERSION}\\\"
 LDFLAGS+=	-lX11 -lXss
 
 PLIST_FILES=	bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>