diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 3d30382b2242..788173c7f8dd 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,55 +1,47 @@
 # Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
 
 PORTNAME=	milter-manager
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+DISTVERSION=	2.1.6
 CATEGORIES=	mail ruby
-MASTER_SITES=	OSDN/${PORTNAME}
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Super milter that can invoke several milters selectively
 
 LICENSE=	AGPLv3 GFDL GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
+BUILD_DEPENDS=	rubygem-gio2>0:devel/rubygem-gio2
 LIB_DEPENDS=	libev.so:devel/libev
-RUN_DEPENDS=	rubygem-glib2>0:devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-gio2>0:devel/rubygem-gio2
 
-USES=		compiler:c++11-lang gettext gmake gnome libtool pathfix pkgconfig
+USES=		compiler:c++11-lang gettext gmake gnome libtool pathfix \
+		pkgconfig
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	milter-manager
 USE_RUBY=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libev \
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
+		--with-libev \
 		--with-package-platform=freebsd
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${DOCSDIR}
-.else
-CONFIGURE_ARGS+=--with-html-dir=${WRKDIR}/doc
-.endif
-
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-EXAMPLESDIR=	${WRKDIR}/examples
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name Makefile.in -exec \
 	${REINPLACE_CMD} -e "s#\$$(datadir)/@PACKAGE@#${DATADIR}#" \
 			 -e "s#\$$(datarootdir)/\$$(PACKAGE)#${DATADIR}#" {} +
 	@${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure
 	@${RM} -r ${WRKSRC}/binding/ruby/glib-2.2.5
 
 .include <bsd.port.mk>
diff --git a/mail/milter-manager/distinfo b/mail/milter-manager/distinfo
index 131df2a77853..23d7e7f80a0f 100644
--- a/mail/milter-manager/distinfo
+++ b/mail/milter-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521370741
-SHA256 (milter-manager-2.1.1.tar.gz) = 315170b261f7557a896dd5607e785279a293c81ce1f7116906102f8376b120c6
-SIZE (milter-manager-2.1.1.tar.gz) = 6619833
+TIMESTAMP = 1644938800
+SHA256 (milter-manager-2.1.6.tar.gz) = 3e656abd3d60677b68a02e35b31d9f7b1d0939fe47dd38425618458b5a5e703f
+SIZE (milter-manager-2.1.6.tar.gz) = 6086564