diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 014fd93cf5bd..976d588f895a 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -1,50 +1,47 @@
 # Created by: Anders Nordby <anders@fix.no>
 
 PORTNAME=	mdbtools
-DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	databases
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion \
 		flex:textproc/flex \
 		gawk:lang/gawk
 LIB_DEPENDS=	libodbcinst.so:databases/unixODBC
 RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
 
-USES=		autoreconf bison gnome iconv:wchar_t libtool pathfix \
+USES=		bison gnome iconv:wchar_t libtool pathfix \
 		pkgconfig readline
-USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-unixodbc=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${WRKSRC}/include
-
 OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR NLS
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 LIBMSWSTR_DESC=	Read and parse JET 4 mdb file indices
 
 LIBMSWSTR_LIB_DEPENDS=		libmswstr.so:databases/libmswstr
 LIBMSWSTR_CONFIGURE_ENV_OFF=	ac_cv_lib_mswstr_DBLCMapStringW=no
 MANPAGES_CONFIGURE_OFF=		--disable-man
 NLS_USES=			gettext
 
-DOCS=		AUTHORS HACKING.md NEWS README.md TODO.md
+DOCS=		AUTHORS HACKING.md NEWS README.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,}  ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
index 0d8155d3111a..3fe0d8002f5f 100644
--- a/databases/mdbtools/distinfo
+++ b/databases/mdbtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635088788
-SHA256 (mdbtools-mdbtools-v1.0.0_GH0.tar.gz) = dc6ce8555f0c08bab6d19dbec767f466a78611974e0ff44261b468b68a7acf85
-SIZE (mdbtools-mdbtools-v1.0.0_GH0.tar.gz) = 220553
+TIMESTAMP = 1641508630
+SHA256 (mdbtools-1.0.0.tar.gz) = 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955
+SIZE (mdbtools-1.0.0.tar.gz) = 643866
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index bdafcac95f59..6ba6d75d506d 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -1,60 +1,59 @@
 bin/mdb-array
 bin/mdb-count
 bin/mdb-export
 bin/mdb-header
 bin/mdb-hexdump
 bin/mdb-json
 bin/mdb-parsecsv
 bin/mdb-prop
 bin/mdb-queries
 bin/mdb-schema
 bin/mdb-sql
 bin/mdb-tables
 bin/mdb-ver
 include/mdbsql.h
 include/mdbtools.h
 lib/libmdb.a
 lib/libmdb.so
 lib/libmdb.so.3
 lib/libmdb.so.3.1.0
 lib/libmdbsql.a
 lib/libmdbsql.so
 lib/libmdbsql.so.3
 lib/libmdbsql.so.3.1.0
 lib/odbc/libmdbodbc.a
 lib/odbc/libmdbodbc.so
 lib/odbc/libmdbodbcW.a
 lib/odbc/libmdbodbcW.so
 libdata/pkgconfig/libmdb.pc
 libdata/pkgconfig/libmdbsql.pc
 %%MANPAGES%%man/man1/mdb-array.1.gz
 %%MANPAGES%%man/man1/mdb-count.1.gz
 %%MANPAGES%%man/man1/mdb-export.1.gz
 %%MANPAGES%%man/man1/mdb-header.1.gz
 %%MANPAGES%%man/man1/mdb-hexdump.1.gz
 %%MANPAGES%%man/man1/mdb-import.1.gz
 %%MANPAGES%%man/man1/mdb-json.1.gz
 %%MANPAGES%%man/man1/mdb-parsecsv.1.gz
 %%MANPAGES%%man/man1/mdb-prop.1.gz
 %%MANPAGES%%man/man1/mdb-queries.1.gz
 %%MANPAGES%%man/man1/mdb-schema.1.gz
 %%MANPAGES%%man/man1/mdb-sql.1.gz
 %%MANPAGES%%man/man1/mdb-tables.1.gz
 %%MANPAGES%%man/man1/mdb-ver.1.gz
 share/bash-completion/completions/mdb-count
 share/bash-completion/completions/mdb-export
 share/bash-completion/completions/mdb-hexdump
 share/bash-completion/completions/mdb-import
 share/bash-completion/completions/mdb-json
 share/bash-completion/completions/mdb-parsecsv
 share/bash-completion/completions/mdb-prop
 share/bash-completion/completions/mdb-queries
 share/bash-completion/completions/mdb-schema
 share/bash-completion/completions/mdb-sql
 share/bash-completion/completions/mdb-tables
 share/bash-completion/completions/mdb-ver
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.md
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO.md